feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtVersion: Get version string from qmake -query

Browse Source 
We need to run qmake -query during initialization anyway, so it
makes no sense to use the faste qmake --version to get the
Qt version number.

Change-Id: If4f5efa074885a9be8938d54767008d8f1dc0d6b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-03-30 16:44:28 +02:00
parent f19c170a1e
commit 5c7bc3949c
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -755,16 +755,7 @@ BaseQtVersion::QmakeBuildConfigs BaseQtVersion::defaultBuildConfig() const
QString BaseQtVersion::qtVersionString() const QString BaseQtVersion::qtVersionString() const
{ {
if (!m_qtVersionString.isNull()) updateVersionInfo();
return m_qtVersionString;
m_qtVersionString.clear();
if (m_qmakeIsExecutable) {
const QString qmake = qmakeCommand().toString();
m_qtVersionString =
ProjectExplorer::DebuggingHelperLibrary::qtVersionForQMake(qmake, &m_qmakeIsExecutable);
} else {
qWarning("Cannot determine the Qt version: %s cannot be run.", qPrintable(qmakeCommand().toString()));
}
return m_qtVersionString; return m_qtVersionString;
} }
@@ -844,6 +835,7 @@ void BaseQtVersion::updateVersionInfo() const
if (fi.exists()) if (fi.exists())
m_hasDemos = true; m_hasDemos = true;
} }
m_qtVersionString = m_versionInfo.value(QLatin1String("QT_VERSION"), QString());
m_versionInfoUpToDate = true; m_versionInfoUpToDate = true;
} }