From 4ba7309b73c49c66f0c3d74ca8f718eefd378f74 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Wed, 28 Nov 2012 13:39:22 +0100
Subject: [PATCH] Do not set displayName in BaseQtVersion
This will trigger a run of qmake -query which depends on a virtual
method. Set the display name in the derived Qt versions instead.
Change-Id: I47380fd25d38a2cf748a26e9c8324f3b23cb3b39
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/android/androidqtversion.cpp | 1 +
src/plugins/madde/maemoqtversion.cpp | 2 +-
src/plugins/qnx/blackberryqtversion.cpp | 2 +-
src/plugins/qnx/qnxqtversion.cpp | 1 +
src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp | 2 +-
.../qt4projectmanager/qt-desktop/simulatorqtversion.cpp | 2 +-
src/plugins/qt4projectmanager/winceqtversion.cpp | 1 +
src/plugins/qtsupport/baseqtversion.cpp | 1 -
src/plugins/remotelinux/embeddedlinuxqtversion.cpp | 4 +++-
9 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index 794871a69c0..d815162e5b7 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -43,6 +43,7 @@ AndroidQtVersion::AndroidQtVersion()
AndroidQtVersion::AndroidQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource)
{
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
AndroidQtVersion *AndroidQtVersion::clone() const
diff --git a/src/plugins/madde/maemoqtversion.cpp b/src/plugins/madde/maemoqtversion.cpp
index 2a8da1fd974..822e058c081 100644
--- a/src/plugins/madde/maemoqtversion.cpp
+++ b/src/plugins/madde/maemoqtversion.cpp
@@ -60,7 +60,7 @@ MaemoQtVersion::MaemoQtVersion(const Utils::FileName &path, bool isAutodetected,
m_isvalidVersion(false),
m_initialized(false)
{
-
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
MaemoQtVersion::~MaemoQtVersion()
diff --git a/src/plugins/qnx/blackberryqtversion.cpp b/src/plugins/qnx/blackberryqtversion.cpp
index fefe644b2fe..104524b3d71 100644
--- a/src/plugins/qnx/blackberryqtversion.cpp
+++ b/src/plugins/qnx/blackberryqtversion.cpp
@@ -145,7 +145,7 @@ BlackBerryQtVersion::BlackBerryQtVersion()
BlackBerryQtVersion::BlackBerryQtVersion(QnxArchitecture arch, const Utils::FileName &path, bool isAutoDetected, const QString &autoDetectionSource)
: QnxAbstractQtVersion(arch, path, isAutoDetected, autoDetectionSource)
{
-
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
BlackBerryQtVersion::~BlackBerryQtVersion()
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index fc008451f97..54c1575ec54 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -46,6 +46,7 @@ QnxQtVersion::QnxQtVersion()
QnxQtVersion::QnxQtVersion(QnxArchitecture arch, const Utils::FileName &path, bool isAutoDetected, const QString &autoDetectionSource)
: QnxAbstractQtVersion(arch, path, isAutoDetected, autoDetectionSource)
{
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
QnxQtVersion *QnxQtVersion::clone() const
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index 292ae22df7f..693d3a3885a 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -49,7 +49,7 @@ DesktopQtVersion::DesktopQtVersion()
DesktopQtVersion::DesktopQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: BaseQtVersion(path, isAutodetected, autodetectionSource)
{
-
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
DesktopQtVersion::~DesktopQtVersion()
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
index 6ba1b2e28dd..13f3e87bf5c 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
@@ -49,7 +49,7 @@ SimulatorQtVersion::SimulatorQtVersion()
SimulatorQtVersion::SimulatorQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource)
{
-
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
SimulatorQtVersion::~SimulatorQtVersion()
diff --git a/src/plugins/qt4projectmanager/winceqtversion.cpp b/src/plugins/qt4projectmanager/winceqtversion.cpp
index 081baf6f02b..fbc2db10ee4 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.cpp
+++ b/src/plugins/qt4projectmanager/winceqtversion.cpp
@@ -50,6 +50,7 @@ WinCeQtVersion::WinCeQtVersion(const Utils::FileName &path, const QString &archT
m_archType = ProjectExplorer::Abi::X86Architecture;
else if (0 == archType.compare(QLatin1String("mipsii"), Qt::CaseInsensitive))
m_archType = ProjectExplorer::Abi::MipsArchitecture;
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
WinCeQtVersion::~WinCeQtVersion()
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 97499cfcda4..9b88d45c1ca 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -185,7 +185,6 @@ BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand, bool isAutodetected,
m_qmakeIsExecutable(true)
{
ctor(qmakeCommand);
- setDisplayName(defaultDisplayName(qtVersionString(), qmakeCommand, false));
}
BaseQtVersion::BaseQtVersion()
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
index 9986251ec38..713bf3eb978 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
@@ -44,7 +44,9 @@ EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion()
EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: BaseQtVersion(path, isAutodetected, autodetectionSource)
-{ }
+{
+ setDisplayName(defaultDisplayName(qtVersionString(), path, false));
+}
EmbeddedLinuxQtVersion::~EmbeddedLinuxQtVersion()
{ }
--
GitLab