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

WinRt: Use current plugin setup naming pattern

Browse Source 
Change-Id: I13eddd9c92b41bfdc4964eecde64f9dd8f3cc147
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
hjk
2019-03-20 13:21:53 +01:00
parent ee801a0eb5
commit 9dac076650
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/winrt/winrtplugin.cpp
View File

@@ -43,7 +43,7 @@ using namespace ProjectExplorer;
namespace WinRt { namespace WinRt {
namespace Internal { namespace Internal {
class WinRtPluginRunData class WinRtPluginPrivate
{ {
public: public:
WinRtRunConfigurationFactory runConfigFactory; WinRtRunConfigurationFactory runConfigFactory;
@@ -58,14 +58,9 @@ public:
WinRtDeviceFactory emulatorDeviceFactory{Constants::WINRT_DEVICE_TYPE_EMULATOR}; WinRtDeviceFactory emulatorDeviceFactory{Constants::WINRT_DEVICE_TYPE_EMULATOR};
}; };
WinRtPlugin::WinRtPlugin()
{
setObjectName(QLatin1String("WinRtPlugin"));
}
WinRtPlugin::~WinRtPlugin() WinRtPlugin::~WinRtPlugin()
{ {
delete m_runData; delete d;
} }
bool WinRtPlugin::initialize(const QStringList &arguments, QString *errorMessage) bool WinRtPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -73,7 +68,7 @@ bool WinRtPlugin::initialize(const QStringList &arguments, QString *errorMessage
Q_UNUSED(arguments) Q_UNUSED(arguments)
Q_UNUSED(errorMessage) Q_UNUSED(errorMessage)
m_runData = new WinRtPluginRunData; d = new WinRtPluginPrivate;
auto runConstraint = [](RunConfiguration *runConfig) { auto runConstraint = [](RunConfiguration *runConfig) {
IDevice::ConstPtr device = DeviceKitAspect::device(runConfig->target()->kit()); IDevice::ConstPtr device = DeviceKitAspect::device(runConfig->target()->kit());

5
src/plugins/winrt/winrtplugin.h
View File

@@ -30,22 +30,19 @@
namespace WinRt { namespace WinRt {
namespace Internal { namespace Internal {
class WinRtPluginRunData;
class WinRtPlugin : public ExtensionSystem::IPlugin class WinRtPlugin : public ExtensionSystem::IPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "WinRt.json") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "WinRt.json")
public: public:
WinRtPlugin();
~WinRtPlugin() final; ~WinRtPlugin() final;
private: private:
bool initialize(const QStringList &arguments, QString *errorMessage) final; bool initialize(const QStringList &arguments, QString *errorMessage) final;
void extensionsInitialized() final {} void extensionsInitialized() final {}
WinRtPluginRunData *m_runData = nullptr; class WinRtPluginPrivate *d = nullptr;
}; };
} // namespace Internal } // namespace Internal