feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qmake build of unittests

Browse Source 
This basically continues / amends work done
with e1c88116b3.

Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2020-08-25 12:07:49 +02:00
parent 666cdd754c
commit 0de1668802
20 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/corepluginunittestfiles.pri
View File

@@ -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

3
src/plugins/coreplugin/icontext.h
View File

@@ -27,7 +27,8 @@
#include "core_global.h"
#include "helpitem.h"
#include "id.h"
#include <utils/id.h>
#include <QList>
#include <QObject>

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -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);

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
View File

@@ -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:

2
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -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"));

2
src/plugins/qbsprojectmanager/qbsbuildstep.h
View File

@@ -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;

2
src/plugins/qbsprojectmanager/qbscleanstep.cpp
View File

@@ -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"));

2
src/plugins/qbsprojectmanager/qbscleanstep.h
View File

@@ -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;

2
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -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"));

2
src/plugins/qbsprojectmanager/qbsinstallstep.h
View File

@@ -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;

6
src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
View File

@@ -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<Kit *> 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);

1
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -40,7 +40,6 @@
#include <coreplugin/documentmanager.h>
#include <coreplugin/icontext.h>
#include <coreplugin/icore.h>
#include <coreplugin/id.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/progressmanager/progressmanager.h>

3
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -35,6 +35,7 @@
#include <projectexplorer/task.h>
#include <utils/environment.h>
#include <utils/id.h>
#include <QFutureWatcher>
#include <QHash>
@@ -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,

2
src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp
View File

@@ -62,7 +62,7 @@ bool AssetExporterView::loadQmlFile(const Utils::FilePath &path, uint timeoutSec
setState(LoadState::Busy);
m_retryCount = std::max(MinRetry, static_cast<int>((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();

2
src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
View File

@@ -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);

2
src/plugins/qmldesigner/components/formeditor/formeditorwidget.h
View File

@@ -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<FormEditorView> m_formEditorView;
QPointer<FormEditorGraphicsView> m_graphicsView;

2
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
View File

@@ -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);
}
}

2
src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
View File

@@ -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)

2
src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp
View File

@@ -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)

6
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -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);
}