summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-03-09 12:46:15 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2020-03-09 13:26:13 +0000
commit7f1c1baf8c5c88cd4c40cffd35299bde3c915c72 (patch)
tree8e586b091cac13f53a6caa990cf2b3739cad69c5
parenta7c05e5e113e9b10e09d395cfc0686ded9356453 (diff)
downloadqt-creator-7f1c1baf8c5c88cd4c40cffd35299bde3c915c72.tar.gz
ProjectExplorer: Register the "QtKeywordsEnabled" macro in time
It was used in the header template before we made it known to the wizard. Fixes: QTCREATORBUG-23603 Change-Id: I4b0f77c199aa22cc1b9853657695cdb10b96faad Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index e750dd59ea..ab99fa4de9 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -49,6 +49,7 @@ static char KEY_SELECTED_PROJECT[] = "SelectedProject";
static char KEY_SELECTED_NODE[] = "SelectedFolderNode";
static char KEY_IS_SUBPROJECT[] = "IsSubproject";
static char KEY_VERSIONCONTROL[] = "VersionControl";
+static char KEY_QT_KEYWORDS_ENABLED[] = "QtKeywordsEnabled";
namespace ProjectExplorer {
@@ -105,6 +106,7 @@ void JsonSummaryPage::initializePage()
m_wizard->setValue(QLatin1String(KEY_SELECTED_NODE), QVariant());
m_wizard->setValue(QLatin1String(KEY_IS_SUBPROJECT), false);
m_wizard->setValue(QLatin1String(KEY_VERSIONCONTROL), QString());
+ m_wizard->setValue(QLatin1String(KEY_QT_KEYWORDS_ENABLED), false);
connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::triggerCommit);
connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::addToProject);
@@ -270,7 +272,7 @@ void JsonSummaryPage::updateProjectData(FolderNode *node)
projectNode = projectNode->parentProjectNode();
}
}
- m_wizard->setValue("QtKeywordsEnabled", qtKeyWordsEnabled);
+ m_wizard->setValue(QLatin1String(KEY_QT_KEYWORDS_ENABLED), qtKeyWordsEnabled);
updateFileList();
}