diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-04-18 14:13:18 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-04-18 15:38:03 +0200 |
| commit | f86c9b65726e879652561e6db04e6688bc48f48c (patch) | |
| tree | 955e5213c9faab375f828e344997047638ca7efd /src/plugins/qt4projectmanager/qtversionmanager.cpp | |
| parent | bf511a2bcb3d462b4c8ee286b6b64ce85a5f8755 (diff) | |
QmlDump: Ensure that qmldump is found in QtSDKv2.2.0-rc1
We ship a precompiled qmldump in the Qt SDK because the Qt versions
don't have private headers. However, the logic in buildablehelperlibrary
by default rejects any build that is older than the latest changes to the
qmldump source code files; allow Qt Creator to pick up the (maybe
outdated) qmldump nevertheless if no private headers are installed.
Reviewed-by: ckamm
Task-number: QTCREATORBUG-4578
Diffstat (limited to 'src/plugins/qt4projectmanager/qtversionmanager.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 8c5c1345fe9..6bfb61d952f 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1271,11 +1271,14 @@ void QtVersion::updateVersionInfo() const if (m_versionInfo.contains("QT_INSTALL_DATA")) { QString qtInstallData = m_versionInfo.value("QT_INSTALL_DATA"); + QString qtHeaderData = m_versionInfo.value("QT_INSTALL_HEADERS"); m_versionInfo.insert("QMAKE_MKSPECS", QDir::cleanPath(qtInstallData+"/mkspecs")); if (!qtInstallData.isEmpty()) { m_hasDebuggingHelper = !DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty(); - m_hasQmlDump = !QmlDumpTool::toolByInstallData(qtInstallData, false).isEmpty() || !QmlDumpTool::toolByInstallData(qtInstallData, true).isEmpty(); + m_hasQmlDump + = !QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, false).isEmpty() + || !QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, true).isEmpty(); m_hasQmlDebuggingLibrary = !QmlDebuggingLibrary::libraryByInstallData(qtInstallData, false).isEmpty() || !QmlDebuggingLibrary::libraryByInstallData(qtInstallData, true).isEmpty(); @@ -1975,9 +1978,10 @@ QString QtVersion::gdbDebuggingHelperLibrary() const QString QtVersion::qmlDumpTool(bool debugVersion) const { QString qtInstallData = versionInfo().value("QT_INSTALL_DATA"); + QString qtHeaderData = versionInfo().value("QT_INSTALL_HEADERS"); if (qtInstallData.isEmpty()) return QString(); - return QmlDumpTool::toolByInstallData(qtInstallData, debugVersion); + return QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, debugVersion); } QString QtVersion::qmlDebuggingHelperLibrary(bool debugVersion) const |