diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
| commit | 99ba300ae3ab8776a39a987dc45c9c7afe75b493 (patch) | |
| tree | f1389a0980ecd0a549ebcccc54600c3ae04d6f06 /src/plugins/qmlprojectmanager/qmlproject.cpp | |
| parent | 01bb7443fdb848899fef41e9f661a455e2e6e4ee (diff) | |
| parent | d78d7dbce3d4a85e7f111db719dde0b943814575 (diff) | |
| download | qt-creator-99ba300ae3ab8776a39a987dc45c9c7afe75b493.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
src/libs/libs.pro
src/plugins/debugger/watchwindow.cpp
src/plugins/remotelinux/maemopackagecreationstep.h
Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlproject.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index ff33b08d93..d65048a641 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -147,8 +147,9 @@ void QmlProject::refresh(RefreshOptions options) if (activeTarget()) { if (QmlProjectRunConfiguration *rc = qobject_cast<QmlProjectRunConfiguration *>(activeTarget()->activeRunConfiguration())) version = rc->qtVersion(); - QList<ProjectExplorer::ToolChain *> tcList - = ProjectExplorer::ToolChainManager::instance()->findToolChains(version->qtAbis().at(0)); + QList<ProjectExplorer::ToolChain *> tcList; + if (version && !version->qtAbis().isEmpty()) + 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); |