aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/winrt
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/winrt')
-rw-r--r--src/plugins/winrt/winrtdevice.cpp8
-rw-r--r--src/plugins/winrt/winrtdevice.h4
-rw-r--r--src/plugins/winrt/winrtpackagedeploymentstep.cpp4
-rw-r--r--src/plugins/winrt/winrtphoneqtversion.cpp11
-rw-r--r--src/plugins/winrt/winrtphoneqtversion.h4
-rw-r--r--src/plugins/winrt/winrtqtversion.cpp8
-rw-r--r--src/plugins/winrt/winrtqtversion.h4
-rw-r--r--src/plugins/winrt/winrtrunconfiguration.cpp2
-rw-r--r--src/plugins/winrt/winrtrunconfiguration.h2
-rw-r--r--src/plugins/winrt/winrtruncontrol.cpp2
10 files changed, 25 insertions, 24 deletions
diff --git a/src/plugins/winrt/winrtdevice.cpp b/src/plugins/winrt/winrtdevice.cpp
index ed338684919..1a77ca68467 100644
--- a/src/plugins/winrt/winrtdevice.cpp
+++ b/src/plugins/winrt/winrtdevice.cpp
@@ -98,7 +98,7 @@ QVariantMap WinRtDevice::toMap() const
return map;
}
-QString WinRtDevice::displayNameForType(Core::Id type)
+QString WinRtDevice::displayNameForType(Utils::Id type)
{
if (type == Constants::WINRT_DEVICE_TYPE_LOCAL)
return QCoreApplication::translate("WinRt::Internal::WinRtDevice",
@@ -115,7 +115,7 @@ QString WinRtDevice::displayNameForType(Core::Id type)
// Factory
-WinRtDeviceFactory::WinRtDeviceFactory(Core::Id deviceType)
+WinRtDeviceFactory::WinRtDeviceFactory(Utils::Id deviceType)
: ProjectExplorer::IDeviceFactory(deviceType)
{
if (allPrerequisitesLoaded()) {
@@ -311,7 +311,7 @@ void WinRtDeviceFactory::parseRunnerOutput(const QByteArray &output) const
}
const IDevice::MachineType machineType = machineTypeFromLine(line);
- Core::Id deviceType;
+ Utils::Id deviceType;
QString name;
QString internalName = QStringLiteral("WinRT.");
if (state == AppxState) {
@@ -334,7 +334,7 @@ void WinRtDeviceFactory::parseRunnerOutput(const QByteArray &output) const
deviceType = Constants::WINRT_DEVICE_TYPE_PHONE;
}
internalName += QString::number(deviceId);
- const Core::Id internalId = Core::Id::fromString(internalName);
+ const Utils::Id internalId = Utils::Id::fromString(internalName);
++numFound;
if (DeviceManager::instance()->find(internalId)) {
qCDebug(winrtDeviceLog) << __FUNCTION__ << "Skipping device with ID" << deviceId;
diff --git a/src/plugins/winrt/winrtdevice.h b/src/plugins/winrt/winrtdevice.h
index d6eeb4cba92..aeb77f64ccb 100644
--- a/src/plugins/winrt/winrtdevice.h
+++ b/src/plugins/winrt/winrtdevice.h
@@ -46,7 +46,7 @@ public:
void fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
- static QString displayNameForType(Core::Id type);
+ static QString displayNameForType(Utils::Id type);
int deviceId() const { return m_deviceId; }
void setDeviceId(int deviceId) { m_deviceId = deviceId; }
@@ -60,7 +60,7 @@ class WinRtDeviceFactory final : public QObject, public ProjectExplorer::IDevice
{
Q_OBJECT
public:
- explicit WinRtDeviceFactory(Core::Id deviceType);
+ explicit WinRtDeviceFactory(Utils::Id deviceType);
void autoDetect();
void onPrerequisitesLoaded();
diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
index 5c2759672a3..1a45fb92a08 100644
--- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp
+++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
@@ -90,7 +90,7 @@ class WinRtPackageDeploymentStep final : public AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(WinRt::Internal::WinRtPackageDeploymentStep)
public:
- WinRtPackageDeploymentStep(BuildStepList *bsl, Core::Id id);
+ WinRtPackageDeploymentStep(BuildStepList *bsl, Utils::Id id);
QString defaultWinDeployQtArguments() const;
@@ -170,7 +170,7 @@ void WinRtArgumentsAspect::restoreDefaultValue()
setValue(m_defaultValue);
}
-WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl, Core::Id id)
+WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl, Utils::Id id)
: AbstractProcessStep(bsl, id)
{
setDisplayName(tr("Run windeployqt"));
diff --git a/src/plugins/winrt/winrtphoneqtversion.cpp b/src/plugins/winrt/winrtphoneqtversion.cpp
index dc696d41f61..868b93dc243 100644
--- a/src/plugins/winrt/winrtphoneqtversion.cpp
+++ b/src/plugins/winrt/winrtphoneqtversion.cpp
@@ -27,9 +27,10 @@
#include "winrtconstants.h"
-#include <coreplugin/id.h>
#include <qtsupport/qtsupportconstants.h>
+#include <utils/id.h>
+
#include <QSet>
namespace WinRt {
@@ -40,17 +41,17 @@ QString WinRtPhoneQtVersion::description() const
return tr("Windows Phone");
}
-QSet<Core::Id> WinRtPhoneQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> WinRtPhoneQtVersion::targetDeviceTypes() const
{
return {Constants::WINRT_DEVICE_TYPE_PHONE, Constants::WINRT_DEVICE_TYPE_EMULATOR};
}
-QSet<Core::Id> WinRtPhoneQtVersion::availableFeatures() const
+QSet<Utils::Id> WinRtPhoneQtVersion::availableFeatures() const
{
- QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+ QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
features.insert(QtSupport::Constants::FEATURE_MOBILE);
features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
- features.remove(Core::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
+ features.remove(Utils::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
return features;
}
diff --git a/src/plugins/winrt/winrtphoneqtversion.h b/src/plugins/winrt/winrtphoneqtversion.h
index a8f7062ae79..5133e84ba94 100644
--- a/src/plugins/winrt/winrtphoneqtversion.h
+++ b/src/plugins/winrt/winrtphoneqtversion.h
@@ -36,10 +36,10 @@ class WinRtPhoneQtVersion : public QtSupport::BaseQtVersion
public:
WinRtPhoneQtVersion() = default;
- QSet<Core::Id> availableFeatures() const override;
+ QSet<Utils::Id> availableFeatures() const override;
QString description() const override;
- QSet<Core::Id> targetDeviceTypes() const override;
+ QSet<Utils::Id> targetDeviceTypes() const override;
};
class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
diff --git a/src/plugins/winrt/winrtqtversion.cpp b/src/plugins/winrt/winrtqtversion.cpp
index 33d6a32bdcc..7bc66c36186 100644
--- a/src/plugins/winrt/winrtqtversion.cpp
+++ b/src/plugins/winrt/winrtqtversion.cpp
@@ -38,17 +38,17 @@ QString WinRtQtVersion::description() const
return tr("Windows Runtime");
}
-QSet<Core::Id> WinRtQtVersion::availableFeatures() const
+QSet<Utils::Id> WinRtQtVersion::availableFeatures() const
{
- QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+ QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
features.insert(QtSupport::Constants::FEATURE_MOBILE);
features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
- features.remove(Core::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
+ features.remove(Utils::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
return features;
}
-QSet<Core::Id> WinRtQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> WinRtQtVersion::targetDeviceTypes() const
{
return {Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR};
}
diff --git a/src/plugins/winrt/winrtqtversion.h b/src/plugins/winrt/winrtqtversion.h
index 40030e4e6c2..ffd36af2686 100644
--- a/src/plugins/winrt/winrtqtversion.h
+++ b/src/plugins/winrt/winrtqtversion.h
@@ -38,9 +38,9 @@ public:
WinRtQtVersion() = default;
QString description() const override;
- QSet<Core::Id> availableFeatures() const override;
+ QSet<Utils::Id> availableFeatures() const override;
- QSet<Core::Id> targetDeviceTypes() const override;
+ QSet<Utils::Id> targetDeviceTypes() const override;
};
class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
diff --git a/src/plugins/winrt/winrtrunconfiguration.cpp b/src/plugins/winrt/winrtrunconfiguration.cpp
index 163fc2f5d96..b39468abe7f 100644
--- a/src/plugins/winrt/winrtrunconfiguration.cpp
+++ b/src/plugins/winrt/winrtrunconfiguration.cpp
@@ -65,7 +65,7 @@ LoopbackExemptServerAspect::LoopbackExemptServerAspect()
// WinRtRunConfiguration
-WinRtRunConfiguration::WinRtRunConfiguration(Target *target, Core::Id id)
+WinRtRunConfiguration::WinRtRunConfiguration(Target *target, Utils::Id id)
: RunConfiguration(target, id)
{
setDisplayName(tr("Run App Package"));
diff --git a/src/plugins/winrt/winrtrunconfiguration.h b/src/plugins/winrt/winrtrunconfiguration.h
index 41621dbb36b..3401651d994 100644
--- a/src/plugins/winrt/winrtrunconfiguration.h
+++ b/src/plugins/winrt/winrtrunconfiguration.h
@@ -59,7 +59,7 @@ class WinRtRunConfiguration : public ProjectExplorer::RunConfiguration
Q_OBJECT
public:
- WinRtRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+ WinRtRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
};
class WinRtRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory
diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp
index c5a365edef7..53099cec5cf 100644
--- a/src/plugins/winrt/winrtruncontrol.cpp
+++ b/src/plugins/winrt/winrtruncontrol.cpp
@@ -44,7 +44,7 @@
using ProjectExplorer::DeviceKitAspect;
using ProjectExplorer::IDevice;
using ProjectExplorer::RunControl;
-using Core::Id;
+using Utils::Id;
using ProjectExplorer::Target;
namespace WinRt {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 04:23:40 +0000