PluginFactory in Locale module.

src/modules/locale/LocaleViewStep.cpp

@@ -31,6 +31,9 @@
 #include <QLabel>
 #include <QtConcurrent/QtConcurrentRun>
 
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( LocaleViewStepFactory, registerPlugin<LocaleViewStep>(); )
+
 LocaleViewStep::LocaleViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new QWidget() )

src/modules/locale/LocaleViewStep.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 <QFutureWatcher>
 
@@ -31,9 +33,6 @@ class LocalePage;
 class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "calamares.ViewModule/1.0" )
-
-    Q_INTERFACES( Calamares::ViewStep )
 
 public:
     explicit LocaleViewStep( QObject* parent = nullptr );
@@ -74,4 +73,6 @@ private:
     QList< Calamares::job_ptr > m_jobs;
 };
 
+CALAMARES_PLUGIN_FACTORY_DECLARATION( LocaleViewStepFactory )
+
 #endif // LOCALEVIEWSTEP_H