diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-08-21 10:08:55 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-08-21 10:08:55 +0200 |
| commit | 2a05186194a949eb7efb4d7f917014dc1887b4b1 (patch) | |
| tree | 80bd60b0a652ad21e14a187f467d67031f666a57 /src/plugins/qmlprojectmanager | |
| parent | 3299239095e4eff5b94604841491712a2fbf78ca (diff) | |
| parent | c78f9352d233d99b911b81d63237e033b35c0ba1 (diff) | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
CMakeLists.txt
Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp index 9d9bee9f167..3abb0f4659f 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp @@ -139,6 +139,9 @@ QmlMultiLanguageAspect *QmlMultiLanguageAspect::current(ProjectExplorer::Project QmlMultiLanguageAspect *QmlMultiLanguageAspect::current(ProjectExplorer::Target *target) { + if (!target) + return {}; + if (auto runConfiguration = target->activeRunConfiguration()) { if (auto multiLanguageAspect = runConfiguration->aspect<QmlProjectManager::QmlMultiLanguageAspect>()) return multiLanguageAspect; |