From 7f1c1baf8c5c88cd4c40cffd35299bde3c915c72 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 9 Mar 2020 12:46:15 +0100 Subject: 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 --- src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(); } -- cgit v1.2.3