aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/jsonwizard
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-07-16 17:06:29 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-07-22 15:43:19 +0000
commit46ef3f302704233527a5cae66c03ef2fa0d0b6c2 (patch)
treeff8d81cdc982606f275e25f76d3441bec9d0a555 /src/plugins/projectexplorer/jsonwizard
parent9aa67f225f43be18161f45fa673bc9f7ccd5f273 (diff)
"New class" wizard: Respect the project's "no Qt keywords" setting
Fixes: QTCREATORBUG-6812 Change-Id: I3f51c61f7a1ed1e4626be6bc31fa2e3affed2084 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/jsonwizard')
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index 14072fd319..e750dd59ea 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -254,6 +254,23 @@ void JsonSummaryPage::updateProjectData(FolderNode *node)
m_wizard->setValue(QLatin1String(KEY_SELECTED_PROJECT), QVariant::fromValue(project));
m_wizard->setValue(QLatin1String(KEY_SELECTED_NODE), QVariant::fromValue(node));
m_wizard->setValue(QLatin1String(KEY_IS_SUBPROJECT), node ? true : false);
+ bool qtKeyWordsEnabled = true;
+ if (ProjectTree::hasNode(node)) {
+ const ProjectNode *projectNode = node->asProjectNode();
+ if (!projectNode)
+ projectNode = node->parentProjectNode();
+ while (projectNode) {
+ const QVariant keywordsEnabled = projectNode->data(Constants::QT_KEYWORDS_ENABLED);
+ if (keywordsEnabled.isValid()) {
+ qtKeyWordsEnabled = keywordsEnabled.toBool();
+ break;
+ }
+ if (projectNode->isProduct())
+ break;
+ projectNode = projectNode->parentProjectNode();
+ }
+ }
+ m_wizard->setValue("QtKeywordsEnabled", qtKeyWordsEnabled);
updateFileList();
}