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

Merge remote branch 'origin/2.2'

Browse Source
This commit is contained in:
con
2011-04-20 11:07:25 +02:00
parent 93f39956f2 0edee47c9f
commit e92988261e
16 changed files with 9482 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
@@ -1970,9 +1973,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