From 420c2cf7c477d7360b190d3a61c8e0ebad5eb1c4 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Wed, 9 Sep 2015 18:46:13 +0200
Subject: [PATCH] PluginFactory in Welcome module.

---
 src/modules/welcome/WelcomeViewStep.cpp |  2 ++
 src/modules/welcome/WelcomeViewStep.h   | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp
index 182cf0d97..ca24254e8 100644
--- a/src/modules/welcome/WelcomeViewStep.cpp
+++ b/src/modules/welcome/WelcomeViewStep.cpp
@@ -24,6 +24,8 @@
 
 #include <QVariant>
 
+CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeViewStepFactory, registerPlugin<WelcomeViewStep>(); )
+
 WelcomeViewStep::WelcomeViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_requirementsChecker( new RequirementsChecker( this ) )
diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h
index 890811347..db33a89bd 100644
--- a/src/modules/welcome/WelcomeViewStep.h
+++ b/src/modules/welcome/WelcomeViewStep.h
@@ -21,8 +21,10 @@
 
 #include <QObject>
 
-#include "viewpages/ViewStep.h"
-#include "PluginDllMacro.h"
+#include <utils/PluginFactory.h>
+#include <viewpages/ViewStep.h>
+
+#include <PluginDllMacro.h>
 
 #include <QVariantMap>
 
@@ -32,9 +34,6 @@ class RequirementsChecker;
 class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
-
-    Q_INTERFACES( Calamares::ViewStep )
 
 public:
     explicit WelcomeViewStep( QObject* parent = nullptr );
@@ -63,4 +62,6 @@ private:
     RequirementsChecker* m_requirementsChecker;
 };
 
+CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeViewStepFactory )
+
 #endif // WELCOMEPAGEPLUGIN_H