diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-10-18 13:03:15 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-10-18 17:52:08 +0200 |
| commit | 78dafd4f1f619486ebde78a7c8aa7a6800684e1a (patch) | |
| tree | a12290f38cd9ff22d39597cef630c6eadaf16ef5 /src/plugins/qtsupport | |
| parent | 66c52af89a8a47f537d73153f47bb95aa7c080cb (diff) | |
| download | qt-creator-78dafd4f1f619486ebde78a7c8aa7a6800684e1a.tar.gz | |
BaseQtVersion: Remove some useless calles to updateVersionInfo()
qmakeProperty and qtVersion call that implicitly already.
Change-Id: If4596740b9da02ef662b9831019f19c4d679cd39
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index c24e1eb41b..ced6d1defe 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -872,7 +872,6 @@ FileName BaseQtVersion::mkspecPath() const bool BaseQtVersion::hasMkspec(const FileName &spec) const { - updateVersionInfo(); QFileInfo fi; fi.setFile(QDir::fromNativeSeparators(qmakeProperty("QT_HOST_DATA")) + QLatin1String("/mkspecs/") + spec.toString()); @@ -1015,7 +1014,6 @@ bool BaseQtVersion::hasDocumentation() const QString BaseQtVersion::documentationPath() const { - updateVersionInfo(); return qmakeProperty("QT_INSTALL_DOCS"); } @@ -1027,16 +1025,13 @@ bool BaseQtVersion::hasDemos() const QString BaseQtVersion::demosPath() const { - updateVersionInfo(); return qmakeProperty("QT_INSTALL_DEMOS"); } QString BaseQtVersion::frameworkInstallPath() const { - if (HostOsInfo::isMacHost()) { - updateVersionInfo(); - return m_versionInfo.value(QLatin1String("QT_INSTALL_LIBS")); - } + if (HostOsInfo::isMacHost()) + return qmakeProperty("QT_INSTALL_LIBS"); return QString(); } @@ -1048,7 +1043,6 @@ bool BaseQtVersion::hasExamples() const QString BaseQtVersion::examplesPath() const { - updateVersionInfo(); return qmakeProperty("QT_INSTALL_EXAMPLES"); } @@ -1104,14 +1098,12 @@ bool BaseQtVersion::hasQmlDump() const bool BaseQtVersion::hasQmlDumpWithRelocatableFlag() const { - updateVersionInfo(); return ((qtVersion() > QtVersionNumber(4, 8, 4) && qtVersion() < QtVersionNumber(5, 0, 0)) || qtVersion() >= QtVersionNumber(5, 1, 0)); } bool BaseQtVersion::needsQmlDump() const { - updateVersionInfo(); return qtVersion() < QtVersionNumber(4, 8, 0); } @@ -1123,7 +1115,6 @@ bool BaseQtVersion::hasQmlDebuggingLibrary() const bool BaseQtVersion::needsQmlDebuggingLibrary() const { - updateVersionInfo(); return qtVersion() < QtVersionNumber(4, 8, 0); } |