diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp index 836dcebb15c..98065b25eff 100644 --- a/src/plugins/android/androidqmlpreviewworker.cpp +++ b/src/plugins/android/androidqmlpreviewworker.cpp @@ -23,7 +23,6 @@ #include #include -#include #include #include diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index de8cd5a80b4..10cdecafdb2 100644 --- a/src/plugins/qmldesigner/generateresource.cpp +++ b/src/plugins/qmldesigner/generateresource.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index e4eeb476225..b2bd235fdff 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/src/plugins/qmlprojectmanager/CMakeLists.txt b/src/plugins/qmlprojectmanager/CMakeLists.txt index a1212e8bc15..b94bc29400d 100644 --- a/src/plugins/qmlprojectmanager/CMakeLists.txt +++ b/src/plugins/qmlprojectmanager/CMakeLists.txt @@ -16,7 +16,6 @@ add_qtc_plugin(QmlProjectManager qmlprojectconstants.h qmlprojectmanager_global.h qmlprojectmanagertr.h - qmlprojectmanagerconstants.h qmlprojectplugin.cpp qmlprojectplugin.h qmlprojectrunconfiguration.cpp qmlprojectrunconfiguration.h buildsystem/qmlbuildsystem.cpp buildsystem/qmlbuildsystem.h diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp index da32379b029..d653847c366 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index cee9eb247e6..524150db41b 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index 68ca5460c4f..7a35d9f15e2 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -4,7 +4,7 @@ #include "qmlmainfileaspect.h" #include "qmlproject.h" -#include "qmlprojectmanagerconstants.h" +#include "qmlprojectconstants.h" #include "qmlprojectmanagertr.h" #include diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h index 8f0b8af4617..8fcb0f9f879 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h @@ -5,7 +5,7 @@ #include "qmlprojectmanager_global.h" -#include +#include #include diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 28937ac49b2..0acba25ded6 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -19,7 +19,6 @@ #include "projectexplorer/devicesupport/idevice.h" #include "qmlprojectconstants.h" -#include "qmlprojectmanagerconstants.h" #include "qmlprojectmanagertr.h" #include "utils/algorithm.h" #include diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h index 16b9b9d753b..a9379799540 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h +++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h @@ -22,4 +22,18 @@ const char ALWAYS_OPEN_UI_MODE[] = "J.QtQuick/QmlJSEditor.openUiQmlMode"; const char QML_RESOURCE_PATH[] = "qmldesigner/propertyEditorQmlSources/imports"; const char LANDING_PAGE_PATH[] = "qmldesigner/landingpage"; +const char QML_PROJECT_ID[] = "QmlProjectManager.QmlProject"; +const char QML_RUNCONFIG_ID[] = "QmlProjectManager.QmlRunConfiguration.Qml"; +const char QML_VIEWER_KEY[] = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer"; +const char QML_VIEWER_ARGUMENTS_KEY[] = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"; +const char QML_VIEWER_TARGET_DISPLAY_NAME[] = "QML Viewer"; +const char QML_MAINSCRIPT_KEY[] = "QmlProjectManager.QmlRunConfiguration.MainScript"; +const char USE_MULTILANGUAGE_KEY[] = "QmlProjectManager.QmlRunConfiguration.UseMultiLanguage"; +const char LAST_USED_LANGUAGE[] = "QmlProjectManager.QmlRunConfiguration.LastUsedLanguage"; +const char USER_ENVIRONMENT_CHANGES_KEY[] = "QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"; + +const char EXPORT_MENU[] = "QmlDesigner.ExportMenu"; +const char G_EXPORT_GENERATE[] = "QmlDesigner.Group.GenerateProject"; +const char G_EXPORT_CONVERT[] = "QmlDesigner.Group.ConvertProject"; + } // QmlProjectManager::Constants diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index 9e6f3babd0b..da6bebd6135 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs @@ -25,7 +25,6 @@ QtcPlugin { "qmlproject.qrc", "qmlprojectconstants.h", "qmlprojectmanager_global.h", "qmlprojectmanagertr.h", - "qmlprojectmanagerconstants.h", "qmlprojectplugin.cpp", "qmlprojectplugin.h", "qmlprojectrunconfiguration.cpp", "qmlprojectrunconfiguration.h", project.ide_source_tree + "/src/share/3rdparty/studiofonts/studiofonts.qrc" diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h deleted file mode 100644 index cd8af872885..00000000000 --- a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -namespace QmlProjectManager { -namespace Constants { - -const char QML_PROJECT_ID[] = "QmlProjectManager.QmlProject"; -const char QML_RUNCONFIG_ID[] = "QmlProjectManager.QmlRunConfiguration.Qml"; -const char QML_VIEWER_KEY[] = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer"; -const char QML_VIEWER_ARGUMENTS_KEY[] = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"; -const char QML_VIEWER_TARGET_DISPLAY_NAME[] = "QML Viewer"; -const char QML_MAINSCRIPT_KEY[] = "QmlProjectManager.QmlRunConfiguration.MainScript"; -const char USE_MULTILANGUAGE_KEY[] = "QmlProjectManager.QmlRunConfiguration.UseMultiLanguage"; -const char LAST_USED_LANGUAGE[] = "QmlProjectManager.QmlRunConfiguration.LastUsedLanguage"; -const char USER_ENVIRONMENT_CHANGES_KEY[] = "QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"; - -const char EXPORT_MENU[] = "QmlDesigner.ExportMenu"; -const char G_EXPORT_GENERATE[] = "QmlDesigner.Group.GenerateProject"; -const char G_EXPORT_CONVERT[] = "QmlDesigner.Group.ConvertProject"; - -} // namespace Constants -} // namespace QmlProjectManager diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index d2f4a7e6045..05f1d22c3d6 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -6,7 +6,6 @@ #include "qdslandingpage.h" #include "qmlproject.h" #include "qmlprojectconstants.h" -#include "qmlprojectmanagerconstants.h" #include "qmlprojectmanagertr.h" #include "qmlprojectrunconfiguration.h" #include "projectfilecontenttools.h" diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index bbf8c76a2ee..62d3ced2f9d 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmlbuildsystem.h" -#include "qmlprojectrunconfiguration.h" #include "qmlmainfileaspect.h" #include "qmlmultilanguageaspect.h" -#include "qmlprojectmanagerconstants.h" +#include "qmlprojectconstants.h" #include "qmlprojectmanagertr.h" +#include "qmlprojectrunconfiguration.h" #include #include