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>
This commit is contained in:
Tobias Hunger
2012-11-28 13:39:22 +01:00
parent e64661d4bb
commit 4ba7309b73
9 changed files with 10 additions and 6 deletions

View File

@@ -43,6 +43,7 @@ AndroidQtVersion::AndroidQtVersion()
AndroidQtVersion::AndroidQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) AndroidQtVersion::AndroidQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource) : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource)
{ {
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
} }
AndroidQtVersion *AndroidQtVersion::clone() const AndroidQtVersion *AndroidQtVersion::clone() const

View File

@@ -60,7 +60,7 @@ MaemoQtVersion::MaemoQtVersion(const Utils::FileName &path, bool isAutodetected,
m_isvalidVersion(false), m_isvalidVersion(false),
m_initialized(false) m_initialized(false)
{ {
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
} }
MaemoQtVersion::~MaemoQtVersion() MaemoQtVersion::~MaemoQtVersion()

View File

@@ -145,7 +145,7 @@ BlackBerryQtVersion::BlackBerryQtVersion()
BlackBerryQtVersion::BlackBerryQtVersion(QnxArchitecture arch, const Utils::FileName &path, bool isAutoDetected, const QString &autoDetectionSource) BlackBerryQtVersion::BlackBerryQtVersion(QnxArchitecture arch, const Utils::FileName &path, bool isAutoDetected, const QString &autoDetectionSource)
: QnxAbstractQtVersion(arch, path, isAutoDetected, autoDetectionSource) : QnxAbstractQtVersion(arch, path, isAutoDetected, autoDetectionSource)
{ {
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
} }
BlackBerryQtVersion::~BlackBerryQtVersion() BlackBerryQtVersion::~BlackBerryQtVersion()

View File

@@ -46,6 +46,7 @@ QnxQtVersion::QnxQtVersion()
QnxQtVersion::QnxQtVersion(QnxArchitecture arch, const Utils::FileName &path, bool isAutoDetected, const QString &autoDetectionSource) QnxQtVersion::QnxQtVersion(QnxArchitecture arch, const Utils::FileName &path, bool isAutoDetected, const QString &autoDetectionSource)
: QnxAbstractQtVersion(arch, path, isAutoDetected, autoDetectionSource) : QnxAbstractQtVersion(arch, path, isAutoDetected, autoDetectionSource)
{ {
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
} }
QnxQtVersion *QnxQtVersion::clone() const QnxQtVersion *QnxQtVersion::clone() const

View File

@@ -49,7 +49,7 @@ DesktopQtVersion::DesktopQtVersion()
DesktopQtVersion::DesktopQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) DesktopQtVersion::DesktopQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: BaseQtVersion(path, isAutodetected, autodetectionSource) : BaseQtVersion(path, isAutodetected, autodetectionSource)
{ {
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
} }
DesktopQtVersion::~DesktopQtVersion() DesktopQtVersion::~DesktopQtVersion()

View File

@@ -49,7 +49,7 @@ SimulatorQtVersion::SimulatorQtVersion()
SimulatorQtVersion::SimulatorQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) SimulatorQtVersion::SimulatorQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource) : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource)
{ {
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
} }
SimulatorQtVersion::~SimulatorQtVersion() SimulatorQtVersion::~SimulatorQtVersion()

View File

@@ -50,6 +50,7 @@ WinCeQtVersion::WinCeQtVersion(const Utils::FileName &path, const QString &archT
m_archType = ProjectExplorer::Abi::X86Architecture; m_archType = ProjectExplorer::Abi::X86Architecture;
else if (0 == archType.compare(QLatin1String("mipsii"), Qt::CaseInsensitive)) else if (0 == archType.compare(QLatin1String("mipsii"), Qt::CaseInsensitive))
m_archType = ProjectExplorer::Abi::MipsArchitecture; m_archType = ProjectExplorer::Abi::MipsArchitecture;
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
} }
WinCeQtVersion::~WinCeQtVersion() WinCeQtVersion::~WinCeQtVersion()

View File

@@ -185,7 +185,6 @@ BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand, bool isAutodetected,
m_qmakeIsExecutable(true) m_qmakeIsExecutable(true)
{ {
ctor(qmakeCommand); ctor(qmakeCommand);
setDisplayName(defaultDisplayName(qtVersionString(), qmakeCommand, false));
} }
BaseQtVersion::BaseQtVersion() BaseQtVersion::BaseQtVersion()

View File

@@ -44,7 +44,9 @@ EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion()
EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: BaseQtVersion(path, isAutodetected, autodetectionSource) : BaseQtVersion(path, isAutodetected, autodetectionSource)
{ } {
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
}
EmbeddedLinuxQtVersion::~EmbeddedLinuxQtVersion() EmbeddedLinuxQtVersion::~EmbeddedLinuxQtVersion()
{ } { }