feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/coreplugin/dialogs/shortcutsettings.cpp

Change-Id: I1f21845350bb69268ca51bc77167a8244adce22a
This commit is contained in:
Eike Ziller
2020-03-26 15:26:27 +01:00
parent 0b7c4520cd 9414961206
commit bac32dc740
96 changed files with 1068 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -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();
}