From 0de1668802f694ece5e2ba546072a445b4e3861b Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 25 Aug 2020 12:07:49 +0200 Subject: [PATCH] Fix qmake build of unittests This basically continues / amends work done with e1c88116b3. Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4 Reviewed-by: hjk Reviewed-by: Christian Kandeler --- src/plugins/coreplugin/corepluginunittestfiles.pri | 2 -- src/plugins/coreplugin/icontext.h | 3 ++- src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 2 +- src/plugins/qbsprojectmanager/qbsbuildconfiguration.h | 2 +- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 2 +- src/plugins/qbsprojectmanager/qbsbuildstep.h | 2 +- src/plugins/qbsprojectmanager/qbscleanstep.cpp | 2 +- src/plugins/qbsprojectmanager/qbscleanstep.h | 2 +- src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 2 +- src/plugins/qbsprojectmanager/qbsinstallstep.h | 2 +- src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp | 6 +++--- src/plugins/qbsprojectmanager/qbsproject.cpp | 1 - src/plugins/qbsprojectmanager/qbsproject.h | 3 ++- .../qmldesigner/assetexporterplugin/assetexporterview.cpp | 2 +- .../qmldesigner/components/formeditor/formeditorwidget.cpp | 2 +- .../qmldesigner/components/formeditor/formeditorwidget.h | 2 +- .../qmldesigner/components/navigator/navigatorview.cpp | 2 +- .../components/timelineeditor/timelinetoolbar.cpp | 2 +- .../components/transitioneditor/transitioneditortoolbar.cpp | 2 +- src/plugins/qmldesigner/documentmanager.cpp | 6 +++--- 20 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/plugins/coreplugin/corepluginunittestfiles.pri b/src/plugins/coreplugin/corepluginunittestfiles.pri index f2ec908f262..891168759a7 100644 --- a/src/plugins/coreplugin/corepluginunittestfiles.pri +++ b/src/plugins/coreplugin/corepluginunittestfiles.pri @@ -2,12 +2,10 @@ DEFINES += CORE_STATIC_LIBRARY HEADERS += \ $$PWD/coreicons.h \ - $$PWD/id.h \ $$PWD/find/ifindfilter.h \ $$PWD/locator/ilocatorfilter.h SOURCES += \ $$PWD/coreicons.cpp \ - $$PWD/id.cpp \ $$PWD/find/ifindfilter.cpp \ $$PWD/locator/ilocatorfilter.cpp diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h index 8884dd31982..792217edb93 100644 --- a/src/plugins/coreplugin/icontext.h +++ b/src/plugins/coreplugin/icontext.h @@ -27,7 +27,8 @@ #include "core_global.h" #include "helpitem.h" -#include "id.h" + +#include #include #include diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 33e41c31c74..47500c60cb5 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -75,7 +75,7 @@ static FilePath defaultBuildDirectory(const FilePath &projectFilePath, const Kit // QbsBuildConfiguration: // --------------------------------------------------------------------------- -QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id) +QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Utils::Id id) : BuildConfiguration(target, id) { setConfigWidgetHasFrame(true); diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h index 4f9454ea1c3..a78912cbff7 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h @@ -62,7 +62,7 @@ class QbsBuildConfiguration final : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::BuildConfigurationFactory; - QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); + QbsBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id); ~QbsBuildConfiguration() final; public: diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 062f48e15bf..49f46ae7d11 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -136,7 +136,7 @@ private: // QbsBuildStep: // -------------------------------------------------------------------- -QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Core::Id id) : +QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id) { setDisplayName(tr("Qbs Build")); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index d257662bdb2..cdb0f94b1dc 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -51,7 +51,7 @@ public: ExpandVariables }; - QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); + QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id); ~QbsBuildStep() override; QVariantMap qbsConfiguration(VariableHandling variableHandling) const; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index 44d33728960..ecfb16f48cc 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -49,7 +49,7 @@ namespace Internal { // QbsCleanStep: // -------------------------------------------------------------------- -QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id id) +QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id) { setDisplayName(tr("Qbs Clean")); diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 81a51351da7..d3afdf6b3e7 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -41,7 +41,7 @@ class QbsCleanStep : public ProjectExplorer::BuildStep Q_OBJECT public: - QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); + QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id); ~QbsCleanStep() override; QbsBuildStepData stepData() const; diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index 9ad460e48e5..86f0368422b 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -87,7 +87,7 @@ private: // QbsInstallStep: // -------------------------------------------------------------------- -QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Core::Id id) +QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Utils::Id id) : BuildStep(bsl, id) { setDisplayName(tr("Qbs Install")); diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index 1a0a418fc37..995f8c8536e 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h @@ -41,7 +41,7 @@ class QbsInstallStep : public ProjectExplorer::BuildStep Q_OBJECT public: - QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); + QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id); ~QbsInstallStep() override; QString installRoot() const; diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index e7de4830aae..c0170558d71 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -164,9 +164,9 @@ void QbsProfilesSettingsWidget::refreshKitsList() m_ui.propertiesView->setModel(nullptr); m_model.reload(); m_ui.profileValueLabel->clear(); - Core::Id currentId; + Utils::Id currentId; if (m_ui.kitsComboBox->count() > 0) - currentId = Core::Id::fromSetting(m_ui.kitsComboBox->currentData()); + currentId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData()); m_ui.kitsComboBox->clear(); int newCurrentIndex = -1; QList validKits = KitManager::kits(); @@ -192,7 +192,7 @@ void QbsProfilesSettingsWidget::displayCurrentProfile() m_ui.propertiesView->setModel(nullptr); if (m_ui.kitsComboBox->currentIndex() == -1) return; - const Core::Id kitId = Core::Id::fromSetting(m_ui.kitsComboBox->currentData()); + const Utils::Id kitId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData()); const Kit * const kit = KitManager::kit(kitId); QTC_ASSERT(kit, return); const QString profileName = QbsProfileManager::ensureProfileForKit(kit); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index f45083fe8a7..ba15c006754 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index 13f9803c254..4786f36981b 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -92,7 +93,7 @@ public: const QString &filePath, const QString &newFilePath) final; QStringList filesGeneratedFrom(const QString &sourceFile) const final; - QVariant additionalData(Core::Id id) const final; + QVariant additionalData(Utils::Id id) const final; bool isProjectEditable() const; bool addFilesToProduct(const QStringList &filePaths, diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp index fbb4173249f..e651599b80e 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp @@ -62,7 +62,7 @@ bool AssetExporterView::loadQmlFile(const Utils::FilePath &path, uint timeoutSec setState(LoadState::Busy); m_retryCount = std::max(MinRetry, static_cast((timeoutSecs * 1000) / RetryIntervalMs)); - m_currentEditor = Core::EditorManager::openEditor(path.toString(), Core::Id(), + m_currentEditor = Core::EditorManager::openEditor(path.toString(), Utils::Id(), Core::EditorManager::DoNotMakeVisible); Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN); Core::ModeManager::setFocusToCurrentMode(); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 74fa9d3b730..c09516cbf83 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -283,7 +283,7 @@ void FormEditorWidget::changeBackgound(const QColor &color) } } -void FormEditorWidget::registerActionAsCommand(QAction *action, Core::Id id, const QKeySequence &keysequence) +void FormEditorWidget::registerActionAsCommand(QAction *action, Utils::Id id, const QKeySequence &keysequence) { Core::Context context(Constants::C_QMLFORMEDITOR); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h index b2f50de6c0f..b32c95916a9 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h @@ -97,7 +97,7 @@ private: void changeRootItemWidth(const QString &widthText); void changeRootItemHeight(const QString &heightText); void changeBackgound(const QColor &color); - void registerActionAsCommand(QAction *action, Core::Id id, const QKeySequence &keysequence); + void registerActionAsCommand(QAction *action, Utils::Id id, const QKeySequence &keysequence); QPointer m_formEditorView; QPointer m_graphicsView; diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index e9a4930a446..2058aef198b 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -321,7 +321,7 @@ void NavigatorView::changeToComponent(const QModelIndex &index) const ModelNode doubleClickNode = modelNodeForIndex(index); if (doubleClickNode.metaInfo().isFileComponent()) Core::EditorManager::openEditor(doubleClickNode.metaInfo().componentFileName(), - Core::Id(), Core::EditorManager::DoNotMakeVisible); + Utils::Id(), Core::EditorManager::DoNotMakeVisible); } } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index 7d11f57cb39..60ca96e93e8 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -84,7 +84,7 @@ static int controlWidth(QToolBar *bar, QObject *control) return 0; } -static QAction *createAction(const Core::Id &id, +static QAction *createAction(const Utils::Id &id, const QIcon &icon, const QString &name, const QKeySequence &shortcut) diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp index af19629234d..726472d149f 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp @@ -85,7 +85,7 @@ static int controlWidth(QToolBar *bar, QObject *control) return 0; } -static QAction *createAction(const Core::Id &id, +static QAction *createAction(const Utils::Id &id, const QIcon &icon, const QString &name, const QKeySequence &shortcut) diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index e1ebfc0a3ff..4550d8a4ea4 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -110,7 +110,7 @@ static void openFileComponent(const ModelNode &modelNode) { QmlDesignerPlugin::instance()->viewManager().nextFileIsCalledInternally(); Core::EditorManager::openEditor(modelNode.metaInfo().componentFileName(), - Core::Id(), Core::EditorManager::DoNotMakeVisible); + Utils::Id(), Core::EditorManager::DoNotMakeVisible); } static void openFileComponentForDelegate(const ModelNode &modelNode) @@ -136,7 +136,7 @@ static void openComponentSourcePropertyOfLoader(const ModelNode &modelNode) componentModelNode = modelNode.nodeListProperty("component").toModelNodeList().constFirst(); } - Core::EditorManager::openEditor(componentModelNode.metaInfo().componentFileName(), Core::Id(), Core::EditorManager::DoNotMakeVisible); + Core::EditorManager::openEditor(componentModelNode.metaInfo().componentFileName(), Utils::Id(), Core::EditorManager::DoNotMakeVisible); } static void openSourcePropertyOfLoader(const ModelNode &modelNode) @@ -146,7 +146,7 @@ static void openSourcePropertyOfLoader(const ModelNode &modelNode) QString componentFileName = modelNode.variantProperty("source").value().toString(); QFileInfo fileInfo(modelNode.model()->fileUrl().toLocalFile()); - Core::EditorManager::openEditor(fileInfo.absolutePath() + "/" + componentFileName, Core::Id(), Core::EditorManager::DoNotMakeVisible); + Core::EditorManager::openEditor(fileInfo.absolutePath() + "/" + componentFileName, Utils::Id(), Core::EditorManager::DoNotMakeVisible); }