diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-25 13:57:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-25 13:57:13 +0200 |
| commit | ae8ac2eb2f118cfb96efec7a40aa8d55be2704ee (patch) | |
| tree | fd36ac3e15c7c243d890d5e91544af5307f8c9fc /src/plugins/qmlprojectmanager/qmlproject.cpp | |
| parent | 76a5b1953ca230d813340a9d536d636aacd0929b (diff) | |
| parent | 899cc0300336a51f0d553c10d0769b145f99af00 (diff) | |
| download | qt-creator-ae8ac2eb2f118cfb96efec7a40aa8d55be2704ee.tar.gz | |
Merge branch '2.3'
Conflicts:
qtcreator.pri
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/remotelinux/maemodeploystepfactory.cpp
src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlproject.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index e9e6312252..ff33b08d93 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -46,7 +46,7 @@ #include <qtsupport/qtversionmanager.h> #include <qmljs/qmljsmodelmanagerinterface.h> #include <utils/fileutils.h> - +#include <projectexplorer/toolchainmanager.h> #include <utils/filesystemwatcher.h> #include <QtCore/QTextStream> @@ -147,7 +147,11 @@ void QmlProject::refresh(RefreshOptions options) if (activeTarget()) { if (QmlProjectRunConfiguration *rc = qobject_cast<QmlProjectRunConfiguration *>(activeTarget()->activeRunConfiguration())) version = rc->qtVersion(); - QtSupport::QmlDumpTool::pathAndEnvironment(this, version, false, &pinfo.qmlDumpPath, &pinfo.qmlDumpEnvironment); + QList<ProjectExplorer::ToolChain *> tcList + = ProjectExplorer::ToolChainManager::instance()->findToolChains(version->qtAbis().at(0)); + if (tcList.isEmpty()) + return; + QtSupport::QmlDumpTool::pathAndEnvironment(this, version, tcList.first(), false, &pinfo.qmlDumpPath, &pinfo.qmlDumpEnvironment); } if (version) { pinfo.qtImportsPath = version->versionInfo().value("QT_INSTALL_IMPORTS"); |