diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-12-15 14:58:32 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-01-02 12:49:39 +0000 |
commit | 85a78f883929b54213c37a1cfcc00d5d34c66ebb (patch) | |
tree | f384eeb36a0bd28fcafd8bd0deedf14b39301326 /src/plugins/platforms | |
parent | c9ba2178388b6a1b68eae69709d989d6d4f19d9b (diff) |
Set PLUGIN_CLASS_NAME in .pro files
This fixes static linking and cmake config file generation.
In some cases, the class was renamed for disambiguation or just
uniformity.
Task-number: QTBUG-51248
Change-Id: Ibdce2e1b6a52312f84301c426632e94deeb567bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/plugins/platforms')
9 files changed, 13 insertions, 8 deletions
diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp index 7e2228cfe..d1b3c733c 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp +++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandBrcmEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-brcm-egl.json") @@ -52,7 +52,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandBrcmEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro index 4ff617136..6455aa311 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro +++ b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro @@ -8,4 +8,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandBrcmEglPlatformIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp index 1143c8590..d6999d4af 100644 --- a/src/plugins/platforms/qwayland-egl/main.cpp +++ b/src/plugins/platforms/qwayland-egl/main.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-egl.json") @@ -52,7 +52,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro index b64a8cc44..9ac050dad 100644 --- a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro +++ b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro @@ -8,4 +8,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandEglPlatformIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro index 5457e9dfc..bfeab3feb 100644 --- a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro +++ b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro @@ -6,4 +6,5 @@ OTHER_FILES += \ SOURCES += main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp index 5393a03ef..321182ad5 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandXCompositeEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-egl.json") @@ -52,7 +52,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandXCompositeEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro index 7c7a3dd28..552460396 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro @@ -8,4 +8,5 @@ SOURCES += \ main.cpp PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandXCompositeEglPlatformIntegrationPlugin load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp index 4dcce14ee..fdeda6e1a 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { -class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin +class QWaylandXCompositeGlxPlatformIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-glx.json") @@ -54,7 +54,7 @@ public: QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QWaylandXCompositeGlxPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); Q_UNUSED(system); diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro index c0c12c9d9..899d939bc 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro @@ -11,4 +11,5 @@ HEADERS += \ qwaylandxcompositeglxplatformintegration.h PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QWaylandXCompositeGlxPlatformIntegrationPlugin load(qt_plugin) |