QmlProjectManager: Merge the two *constants file

The reason for the split is unknown, maybe just an accident.

Change-Id: I4fadd003ee2e6f8d91ed9494bd2304b2d35eff81
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/plugins/android/androidqmlpreviewworker.cpp

@@ -23,7 +23,6 @@
 #include <projectexplorer/target.h>
 
 #include <qmlprojectmanager/qmlprojectconstants.h>
-#include <qmlprojectmanager/qmlprojectmanagerconstants.h>
 
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitaspect.h>

src/plugins/qmldesigner/generateresource.cpp

@@ -16,7 +16,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
-#include <qmlprojectmanager/qmlprojectmanagerconstants.h>
+#include <qmlprojectmanager/qmlprojectconstants.h>
 
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitaspect.h>

src/plugins/qmldesigner/shortcutmanager.cpp

@@ -22,7 +22,7 @@
 #include <coreplugin/modemanager.h>
 #include <qmljseditor/qmljseditorconstants.h>
 
-#include <qmlprojectmanager/qmlprojectmanagerconstants.h>
+#include <qmlprojectmanager/qmlprojectconstants.h>
 
 #include <coreplugin/icore.h>
 

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

src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp

@@ -15,7 +15,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
-#include <qmlprojectmanager/qmlprojectmanagerconstants.h>
+#include <qmlprojectmanager/qmlprojectconstants.h>
 
 #include <QAction>
 #include <QMessageBox>

src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp

@@ -18,7 +18,7 @@
 
 #include <qmlprojectmanager/qmlmainfileaspect.h>
 #include <qmlprojectmanager/qmlproject.h>
-#include <qmlprojectmanager/qmlprojectmanagerconstants.h>
+#include <qmlprojectmanager/qmlprojectconstants.h>
 
 #include <extensionsystem/iplugin.h>
 #include <extensionsystem/pluginmanager.h>

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 <qmljstools/qmljstoolsconstants.h>

src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h

@@ -5,7 +5,7 @@
 
 #include "qmlprojectmanager_global.h"
 
-#include <qmlprojectmanager/qmlprojectmanagerconstants.h>
+#include <qmlprojectmanager/qmlprojectconstants.h>
 
 #include <projectexplorer/runconfigurationaspects.h>
 

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 <qmljs/qmljsmodelmanagerinterface.h>

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

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"

src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h

@@ -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 <qglobal.h>
-
-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

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"

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 <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>