diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-26 15:26:27 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-26 15:26:27 +0100 |
| commit | bac32dc740ed5f454ec03c5d97d6c9396ffda0d4 (patch) | |
| tree | 1b2a805aedac7b0acb0837cc91944ec5984d3965 /src/plugins/qmakeprojectmanager | |
| parent | 0b7c4520cdf7b0cdc2dbff938e18475265224c20 (diff) | |
| parent | 94149612068ef9cd78f2e8fb07b70df62b36773e (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
Change-Id: I1f21845350bb69268ca51bc77167a8244adce22a
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakenodes.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 1c2434a79c..84b9595a03 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -112,6 +112,7 @@ bool QmakeBuildSystem::supportsAction(Node *context, ProjectAction action, const } QTC_ASSERT(proFileNode, return false); pro = proFileNode->proFile(); + QTC_ASSERT(pro, return false); t = pro->projectType(); } |