From 9d7e5fc015016d24ecc39aab6e302fe78b27d2f9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 6 Jul 2012 19:25:00 +0200
Subject: [PATCH] *QtVersion::warningReason(): de-duplicate code
Change-Id: I08e370cd83de5ea4f4cdfc079cc908d52d81b192
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
.../qt4projectmanager/qt-desktop/desktopqtversion.cpp | 4 +---
.../qt4projectmanager/qt-desktop/simulatorqtversion.cpp | 4 +---
src/plugins/qtsupport/baseqtversion.cpp | 5 ++++-
src/plugins/remotelinux/embeddedlinuxqtversion.cpp | 8 --------
src/plugins/remotelinux/embeddedlinuxqtversion.h | 2 --
5 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index ba36c19a4e6..4ad0119f264 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -72,9 +72,7 @@ QString DesktopQtVersion::type() const
QStringList DesktopQtVersion::warningReason() const
{
- QStringList ret;
- if (qtAbis().count() == 1 && qtAbis().first().isNull())
- ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building.");
+ QStringList ret = BaseQtVersion::warningReason();
if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed.");
return ret;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
index c3976e9c916..eed72c89c41 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
@@ -72,9 +72,7 @@ QString SimulatorQtVersion::type() const
QStringList SimulatorQtVersion::warningReason() const
{
- QStringList ret;
- if (qtAbis().count() == 1 && qtAbis().first().isNull())
- ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building.");
+ QStringList ret = BaseQtVersion::warningReason();
if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed.");
return ret;
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 0d121cc502e..e8e45d818c1 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -387,7 +387,10 @@ QString BaseQtVersion::invalidReason() const
QStringList BaseQtVersion::warningReason() const
{
- return QStringList();
+ QStringList ret;
+ if (qtAbis().count() == 1 && qtAbis().first().isNull())
+ ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building.");
+ return ret;
}
ProjectExplorer::ToolChain *BaseQtVersion::preferredToolChain(const Utils::FileName &ms) const
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
index 828add99ec0..b566a7073fd 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
@@ -62,14 +62,6 @@ QString EmbeddedLinuxQtVersion::type() const
return RemoteLinux::Constants::EMBEDDED_LINUX_QT;
}
-QStringList EmbeddedLinuxQtVersion::warningReason() const
-{
- QStringList ret;
- if (qtAbis().count() == 1 && qtAbis().first().isNull())
- ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building.");
- return ret;
-}
-
QList<ProjectExplorer::Abi> EmbeddedLinuxQtVersion::detectQtAbis() const
{
return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h
index c68f8c57918..4cd85104c08 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.h
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h
@@ -48,8 +48,6 @@ public:
QString type() const;
- QStringList warningReason() const;
-
QList<ProjectExplorer::Abi> detectQtAbis() const;
QString description() const;
--
GitLab