QPA plugins: Use _iid macros instead of strings in Q_PLUGIN_METADATA.

This makes it easier to change the version numbers by changing
the macros in QtGui.

Task-number: QTBUG-46009
Change-Id: I94c9591ec6f7c9173a698df9e1fe8fd6a904caf4
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

src/plugins/generic/evdevkeyboard/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QEvdevKeyboardPlugin : public QGenericPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevkeyboard.json")
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevkeyboard.json")
 
 public:
     QEvdevKeyboardPlugin();

src/plugins/generic/evdevmouse/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QEvdevMousePlugin : public QGenericPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevmouse.json")
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevmouse.json")
 
 public:
     QEvdevMousePlugin();

src/plugins/generic/evdevtablet/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QEvdevTabletPlugin : public QGenericPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevtablet.json")
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevtablet.json")
 
 public:
     QEvdevTabletPlugin();

src/plugins/generic/evdevtouch/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QEvdevTouchScreenPlugin : public QGenericPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevtouch.json")
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevtouch.json")
 
 public:
     QEvdevTouchScreenPlugin();

src/plugins/generic/libinput/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QLibInputPlugin : public QGenericPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "libinput.json")
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "libinput.json")
 
 public:
     QObject *create(const QString &key, const QString &specification);

src/plugins/generic/tslib/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QTsLibPlugin : public QGenericPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "tslib.json")
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "tslib.json")
 
 public:
     QObject* create(const QString &key, const QString &specification);

src/plugins/generic/tuiotouch/main.cpp

@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QTuioTouchPlugin : public QGenericPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "tuiotouch.json")
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "tuiotouch.json")
 
 public:
     QTuioTouchPlugin();

src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp

@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QComposePlatformInputContextPlugin : public QPlatformInputContextPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "compose.json")
+    Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "compose.json")
 
 public:
     QComposeInputContext *create(const QString &, const QStringList &) Q_DECL_OVERRIDE;

src/plugins/platforminputcontexts/ibus/main.cpp

@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QIbusPlatformInputContextPlugin : public QPlatformInputContextPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "ibus.json")
+    Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "ibus.json")
 
 public:
     QIBusPlatformInputContext *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;

src/plugins/platforms/android/androidplatformplugin.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QAndroidPlatformIntegrationPlugin: public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "android.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "android.json")
 public:
     QPlatformIntegration *create(const QString &key, const QStringList &paramList);
 };

src/plugins/platforms/cocoa/main.mm

@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 class QCocoaIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "cocoa.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "cocoa.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&);
 };

src/plugins/platforms/direct2d/qwindowsdirect2dplatformplugin.cpp

@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsDirect2DIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "direct2d.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "direct2d.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&);
 };

src/plugins/platforms/directfb/main.cpp

@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class QDirectFbIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "directfb.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "directfb.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&);
 };

src/plugins/platforms/eglfs/qeglfsmain.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QEglFSIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "eglfs.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "eglfs.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };

src/plugins/platforms/haiku/main.h

@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 class QHaikuIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "haiku.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "haiku.json")
 
 public:
     QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;

src/plugins/platforms/ios/plugin.mm

@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 class QIOSIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-        Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "ios.json")
+        Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "ios.json")
     public:
         QPlatformIntegration *create(const QString&, const QStringList&);
 };

src/plugins/platforms/kms/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QKmsIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "kms.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "kms.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };

src/plugins/platforms/linuxfb/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QLinuxFbIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "linuxfb.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "linuxfb.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };

src/plugins/platforms/minimal/main.cpp

@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 class QMinimalIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "minimal.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "minimal.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };

src/plugins/platforms/minimalegl/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QMinimalEglIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "minimalegl.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "minimalegl.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };

src/plugins/platforms/offscreen/main.cpp

@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 class QOffscreenIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "offscreen.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "offscreen.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };

src/plugins/platforms/openwfd/main.cpp

@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenWFDIntegrationPlugin : public QPlatformIntegrationPlugin
 {
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid)
 public:
     QPlatformIntegration *create(const QString&, const QStringList&);
 };

src/plugins/platforms/qnx/main.h

@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 class QQnxIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qnx.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qnx.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&);
 };

src/plugins/platforms/windows/main.cpp

@@ -97,7 +97,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "windows.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "windows.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&, int &, char **);
 };

src/plugins/platforms/winrt/main.cpp

@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
 class QWinRTIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "winrt.json")
+    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "winrt.json")
 
 public:
     QStringList keys() const;

src/plugins/platforms/xcb/qxcbmain.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QXcbIntegrationPlugin : public QPlatformIntegrationPlugin
 {
    Q_OBJECT
-   Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "xcb.json")
+   Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "xcb.json")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&, int &, char **) Q_DECL_OVERRIDE;
 };

src/plugins/platformthemes/gtk2/main.cpp

@@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE
 class QGtk2ThemePlugin : public QPlatformThemePlugin
 {
    Q_OBJECT
-   Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformThemeFactoryInterface.5.1" FILE "gtk2.json")
+   Q_PLUGIN_METADATA(IID QPlatformThemeFactoryInterface_iid FILE "gtk2.json")
 
 public:
     QPlatformTheme *create(const QString &key, const QStringList &params) Q_DECL_OVERRIDE;

src/plugins/printsupport/cocoa/main.cpp

@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 class QCocoaPrinterSupportPlugin : public QPlatformPrinterSupportPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.QPlatformPrinterSupportFactoryInterface" FILE "cocoa.json")
+    Q_PLUGIN_METADATA(IID QPlatformPrinterSupportFactoryInterface_iid FILE "cocoa.json")
 
 public:
     QPlatformPrinterSupport *create(const QString &);

src/plugins/printsupport/cups/main.cpp

@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 class QCupsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.QPlatformPrinterSupportFactoryInterface" FILE "cups.json")
+    Q_PLUGIN_METADATA(IID QPlatformPrinterSupportFactoryInterface_iid FILE "cups.json")
 
 public:
     QStringList keys() const;

src/plugins/printsupport/windows/main.cpp

@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.QPlatformPrinterSupportFactoryInterface" FILE "windows.json")
+    Q_PLUGIN_METADATA(IID QPlatformPrinterSupportFactoryInterface_iid FILE "windows.json")
 
 public:
     QPlatformPrinterSupport *create(const QString &);