summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-12-14 13:20:29 +0100
committerKai Koehne <kai.koehne@nokia.com>2011-12-14 16:49:03 +0100
commit3c298aba335b395355ab3955b6648c1d4c557e58 (patch)
treeb100dca8bf4e9650d958c6ec1918a49fc248c6a2
parent007330569b6bb81cf9b738f72d568942bfa5b87c (diff)
downloadqt-creator-3c298aba335b395355ab3955b6648c1d4c557e58.tar.gz
QmlPluginDump: Search in $QT_INSTALL_BINS
We used to search only in $QT_INSTALL_DATA/bin,which might not be the correct location if Qt is configured with "-bindir" Task-number: QTCREATORBUG-6698 Change-Id: Ica54247e7ccd9a94d1a9c5923d258771287b56ac Reviewed-by: Tommi Asp <tommi@mowhi.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
-rw-r--r--src/plugins/qtsupport/baseqtversion.cpp8
-rw-r--r--src/plugins/qtsupport/qmldumptool.cpp9
-rw-r--r--src/plugins/qtsupport/qmldumptool.h6
3 files changed, 15 insertions, 8 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 696558c029..9412cabc53 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -760,14 +760,15 @@ void BaseQtVersion::updateVersionInfo() const
if (m_versionInfo.contains("QT_INSTALL_DATA")) {
QString qtInstallData = m_versionInfo.value("QT_INSTALL_DATA");
+ QString qtInstallBins = m_versionInfo.value("QT_INSTALL_BINS");
QString qtHeaderData = m_versionInfo.value("QT_INSTALL_HEADERS");
m_versionInfo.insert("QMAKE_MKSPECS", QDir::cleanPath(qtInstallData+"/mkspecs"));
if (!qtInstallData.isEmpty()) {
m_hasDebuggingHelper = !ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
m_hasQmlDump
- = !QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, false).isEmpty()
- || !QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, true).isEmpty();
+ = !QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, false).isEmpty()
+ || !QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, true).isEmpty();
m_hasQmlDebuggingLibrary
= !QmlDebuggingLibrary::libraryByInstallData(qtInstallData, false).isEmpty()
|| !QmlDebuggingLibrary::libraryByInstallData(qtInstallData, true).isEmpty();
@@ -930,10 +931,11 @@ QString BaseQtVersion::gdbDebuggingHelperLibrary() const
QString BaseQtVersion::qmlDumpTool(bool debugVersion) const
{
QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
+ QString qtInstallBins = versionInfo().value("QT_INSTALL_BINS");
QString qtHeaderData = versionInfo().value("QT_INSTALL_HEADERS");
if (qtInstallData.isEmpty())
return QString();
- return QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, debugVersion);
+ return QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, debugVersion);
}
QString BaseQtVersion::qmlDebuggingHelperLibrary(bool debugVersion) const
diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp
index cf315d00b8..e84193bdab 100644
--- a/src/plugins/qtsupport/qmldumptool.cpp
+++ b/src/plugins/qtsupport/qmldumptool.cpp
@@ -228,8 +228,9 @@ QString QmlDumpTool::toolForVersion(BaseQtVersion *version, bool debugDump)
{
if (version) {
QString qtInstallData = version->versionInfo().value("QT_INSTALL_DATA");
+ QString qtInstallBins = version->versionInfo().value("QT_INSTALL_BINS");
QString qtInstallHeaders = version->versionInfo().value("QT_INSTALL_HEADERS");
- QString toolPath = toolByInstallData(qtInstallData, qtInstallHeaders, debugDump);
+ QString toolPath = toolForQtPaths(qtInstallData, qtInstallBins, qtInstallHeaders, debugDump);
return toolPath;
}
@@ -253,7 +254,9 @@ static QStringList sourceFileNames()
return files;
}
-QString QmlDumpTool::toolByInstallData(const QString &qtInstallData, const QString &qtInstallHeaders,
+QString QmlDumpTool::toolForQtPaths(const QString &qtInstallData,
+ const QString &qtInstallBins,
+ const QString &qtInstallHeaders,
bool debugDump)
{
if (!Core::ICore::instance())
@@ -261,7 +264,7 @@ QString QmlDumpTool::toolByInstallData(const QString &qtInstallData, const QStri
// check for prebuilt binary first
QFileInfo fileInfo;
- if (getHelperFileInfoFor(validPrebuiltFilenames(debugDump), qtInstallData + QLatin1String("/bin/"), &fileInfo))
+ if (getHelperFileInfoFor(validPrebuiltFilenames(debugDump), qtInstallBins + QLatin1Char('/'), &fileInfo))
return fileInfo.absoluteFilePath();
const QStringList directories = installDirectories(qtInstallData);
diff --git a/src/plugins/qtsupport/qmldumptool.h b/src/plugins/qtsupport/qmldumptool.h
index f9bbc1f6eb..8c97e2297e 100644
--- a/src/plugins/qtsupport/qmldumptool.h
+++ b/src/plugins/qtsupport/qmldumptool.h
@@ -54,8 +54,10 @@ class QTSUPPORT_EXPORT QmlDumpTool : public Utils::BuildableHelperLibrary
public:
static bool canBuild(const BaseQtVersion *qtVersion, QString *reason = 0);
static QString toolForVersion(BaseQtVersion *version, bool debugDump);
- static QString toolByInstallData(const QString &qtInstallData, const QString &qtInstallHeaders,
- bool debugDump);
+ static QString toolForQtPaths(const QString &qtInstallData,
+ const QString &qtInstallBins,
+ const QString &qtInstallHeaders,
+ bool debugDump);
static QStringList locationsByInstallData(const QString &qtInstallData, bool debugDump);
// Build the helpers and return the output log/errormessage.