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

qmldump: Allow for debug and release versions and choose the right one.

Browse Source 
Task-number: QTCREATORBUG-3549
Reviewed-by: Kai Koehne
This commit is contained in:
Christian Kamm
2011-01-24 13:16:27 +01:00
parent bf29397f47
commit 6b37fe19bc
7 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1159,7 +1159,7 @@ void QtVersion::updateVersionInfo() const
if (!qtInstallData.isEmpty()) {
m_hasDebuggingHelper = !DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
m_hasQmlDump = !QmlDumpTool::toolByInstallData(qtInstallData).isEmpty();
m_hasQmlDump = !QmlDumpTool::toolByInstallData(qtInstallData, false).isEmpty() || !QmlDumpTool::toolByInstallData(qtInstallData, true).isEmpty();
m_hasQmlObserver = !QmlObserverTool::toolByInstallData(qtInstallData).isEmpty();
}
}
@@ -1726,12 +1726,12 @@ QString QtVersion::debuggingHelperLibrary() const
return DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
}
QString QtVersion::qmlDumpTool() const
QString QtVersion::qmlDumpTool(bool debugVersion) const
{
QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
if (qtInstallData.isEmpty())
return QString();
return QmlDumpTool::toolByInstallData(qtInstallData);
return QmlDumpTool::toolByInstallData(qtInstallData, debugVersion);
}
QString QtVersion::qmlObserverTool() const