From 85a78f883929b54213c37a1cfcc00d5d34c66ebb Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 15 Dec 2016 14:58:32 +0100 Subject: 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 Reviewed-by: Samuli Piippo --- src/plugins/shellintegration/ivi-shell/ivi-shell.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'src/plugins/shellintegration/ivi-shell') diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro index baaf1698..6af584c5 100644 --- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro +++ b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro @@ -1,4 +1,5 @@ PLUGIN_TYPE = wayland-shell-integration +PLUGIN_CLASS_NAME = QWaylandIviShellIntegrationPlugin load(qt_plugin) QT += gui-private waylandclient-private -- cgit v1.2.1 From 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 Jan 2017 20:35:15 +0100 Subject: load(qt_plugin) at the end amends 5b3f207ed after the addition of the ivi-shell in f144f0f71. Change-Id: I35c3974ed5f257d83280e4dc3421e4a2a57303d6 Reviewed-by: Joerg Bornemann --- src/plugins/shellintegration/ivi-shell/ivi-shell.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/shellintegration/ivi-shell') diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro index 6af584c5..ba716c10 100644 --- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro +++ b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro @@ -1,7 +1,3 @@ -PLUGIN_TYPE = wayland-shell-integration -PLUGIN_CLASS_NAME = QWaylandIviShellIntegrationPlugin -load(qt_plugin) - QT += gui-private waylandclient-private CONFIG += wayland-scanner @@ -25,3 +21,7 @@ SOURCES += \ OTHER_FILES += \ ivi-shell.json + +PLUGIN_TYPE = wayland-shell-integration +PLUGIN_CLASS_NAME = QWaylandIviShellIntegrationPlugin +load(qt_plugin) -- cgit v1.2.1 From f72d63866d3f5820865fcd309b649dc9932518ee Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 12 Jan 2017 13:25:48 +0100 Subject: Replace all occurrences of Q_DECL_OVERRIDE with override Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1 Reviewed-by: Paul Olav Tvete --- src/plugins/shellintegration/ivi-shell/main.cpp | 2 +- src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h | 2 +- src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/shellintegration/ivi-shell') diff --git a/src/plugins/shellintegration/ivi-shell/main.cpp b/src/plugins/shellintegration/ivi-shell/main.cpp index c7af9b15..70ffdb89 100644 --- a/src/plugins/shellintegration/ivi-shell/main.cpp +++ b/src/plugins/shellintegration/ivi-shell/main.cpp @@ -44,7 +44,7 @@ class QWaylandIviShellIntegrationPlugin : public QWaylandShellIntegrationPlugin Q_PLUGIN_METADATA(IID QWaylandShellIntegrationFactoryInterface_iid FILE "ivi-shell.json") public: - virtual QWaylandShellIntegration *create(const QString &key, const QStringList ¶mList) Q_DECL_OVERRIDE; + virtual QWaylandShellIntegration *create(const QString &key, const QStringList ¶mList) override; }; QWaylandShellIntegration *QWaylandIviShellIntegrationPlugin::create(const QString &key, const QStringList ¶mList) diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h index ef1c7609..5a0bfbdc 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h @@ -54,7 +54,7 @@ public: QWaylandIviShellIntegration(); ~QWaylandIviShellIntegration(); bool initialize(QWaylandDisplay *display); - virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) Q_DECL_OVERRIDE; + virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override; private: static void registryIvi(void *data, struct wl_registry *registry, diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h index 9ac81ad6..f96eb3c1 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h @@ -60,7 +60,7 @@ public: private: void createExtendedSurface(QWaylandWindow *window); - virtual void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE; + virtual void ivi_surface_configure(int32_t width, int32_t height) override; QWaylandWindow *m_window; QWaylandExtendedSurface *m_extendedWindow; -- cgit v1.2.1