diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 794871a69c0064fe167245cbb2bb5abab591b63b..d815162e5b7e29701afc42748f63745cd715a341 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 2a8da1fd9745c2f02a3c43d7df730fb0697e11d1..822e058c0814deb9bbb3c3517aecb5b59eacd1fb 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 fefe644b2fea1878a67d5f6c92ea05bbe04e29bc..104524b3d71c18ddf220d25b4fc894fbf8a39f38 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 fc008451f970613e36588e1b17a7ae3e15007548..54c1575ec5440456c96dda0dc0b8c0dfcee7b579 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 292ae22df7f9af7a8fb5f9187888368e88d02b1f..693d3a3885ab586aa22a7ba88481f4068e7df1e5 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 6ba1b2e28ddd8ff2cba1c3e649dab73d21266fa7..13f3e87bf5ced150f12cc701cd61e63afe640cf0 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 081baf6f02b906f38896d37bd15faa34003ff2e0..fbc2db10ee4a90702e6b3c66aca7c3d4fe704c2d 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 97499cfcda4cbf4eccdc5018db24ad62130e30e2..9b88d45c1cab3a3ab4bb3b62721310f87e1f971a 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 9986251ec384f941ba02f7997378891439b52d1a..713bf3eb978e5e54f1a72cdb0f0adf1558e17b58 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() { }