152 lines
8.6 KiB
Diff
152 lines
8.6 KiB
Diff
|
From 7b641c3f05c5b7cebbe5d9fbe90023dcf6eb9394 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
||
|
|
Date: Sun, 6 Oct 2013 13:12:36 +0200
|
||
|
|
Subject: [PATCH] Plugin API version 5.2
|
||
|
|
|
||
|
|
---
|
||
|
|
.../hardware_integration/qwaylandgraphicshardwareintegrationplugin.h | 2 +-
|
||
|
|
src/plugins/platforms/qwayland-brcm-egl/main.cpp | 2 +-
|
||
|
|
src/plugins/platforms/qwayland-egl/main.cpp | 2 +-
|
||
|
|
src/plugins/platforms/qwayland-nogl/main.cpp | 2 +-
|
||
|
|
src/plugins/platforms/qwayland-xcomposite-egl/main.cpp | 2 +-
|
||
|
|
src/plugins/platforms/qwayland-xcomposite-glx/main.cpp | 2 +-
|
||
|
|
src/plugins/waylandcompositors/brcm-egl/main.cpp | 2 +-
|
||
|
|
src/plugins/waylandcompositors/wayland-egl/main.cpp | 2 +-
|
||
|
|
src/plugins/waylandcompositors/xcomposite-egl/main.cpp | 2 +-
|
||
|
|
src/plugins/waylandcompositors/xcomposite-glx/main.cpp | 2 +-
|
||
|
|
10 files changed, 10 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h b/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
|
||
|
|
index 6d68a0c..62ed1a2 100644
|
||
|
|
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
|
||
|
|
+++ b/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
|
||
|
|
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
|
||
|
|
class QWaylandGraphicsHardwareIntegration;
|
||
|
|
|
||
|
|
-#define QWaylandGraphicsHardwareIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1"
|
||
|
|
+#define QWaylandGraphicsHardwareIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2"
|
||
|
|
|
||
|
|
class Q_COMPOSITOR_EXPORT QWaylandGraphicsHardwareIntegrationPlugin : public QObject
|
||
|
|
{
|
||
|
|
diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
|
||
|
|
index 9862223..663d18b 100644
|
||
|
|
--- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp
|
||
|
|
+++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-brcm-egl.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-brcm-egl.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp
|
||
|
|
index 222cc1e..e5a0a2c 100644
|
||
|
|
--- a/src/plugins/platforms/qwayland-egl/main.cpp
|
||
|
|
+++ b/src/plugins/platforms/qwayland-egl/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-egl.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-egl.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/platforms/qwayland-nogl/main.cpp b/src/plugins/platforms/qwayland-nogl/main.cpp
|
||
|
|
index 6069390..d0bdf7f 100644
|
||
|
|
--- a/src/plugins/platforms/qwayland-nogl/main.cpp
|
||
|
|
+++ b/src/plugins/platforms/qwayland-nogl/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-nogl.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-nogl.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
|
||
|
|
index 414830f..0d6bcff 100644
|
||
|
|
--- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
|
||
|
|
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-xcomposite-egl.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-xcomposite-egl.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
|
||
|
|
index d442c81..98ca138 100644
|
||
|
|
--- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
|
||
|
|
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-xcomposite-glx.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-xcomposite-glx.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/waylandcompositors/brcm-egl/main.cpp b/src/plugins/waylandcompositors/brcm-egl/main.cpp
|
||
|
|
index 0fecd2e..8815fbb 100644
|
||
|
|
--- a/src/plugins/waylandcompositors/brcm-egl/main.cpp
|
||
|
|
+++ b/src/plugins/waylandcompositors/brcm-egl/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "brcm-egl.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "brcm-egl.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/waylandcompositors/wayland-egl/main.cpp b/src/plugins/waylandcompositors/wayland-egl/main.cpp
|
||
|
|
index 75a9fba..6bb1c7b 100644
|
||
|
|
--- a/src/plugins/waylandcompositors/wayland-egl/main.cpp
|
||
|
|
+++ b/src/plugins/waylandcompositors/wayland-egl/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "wayland-egl.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "wayland-egl.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/waylandcompositors/xcomposite-egl/main.cpp b/src/plugins/waylandcompositors/xcomposite-egl/main.cpp
|
||
|
|
index 3540d35..7dacb50 100644
|
||
|
|
--- a/src/plugins/waylandcompositors/xcomposite-egl/main.cpp
|
||
|
|
+++ b/src/plugins/waylandcompositors/xcomposite-egl/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-egl.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "xcomposite-egl.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||
|
|
diff --git a/src/plugins/waylandcompositors/xcomposite-glx/main.cpp b/src/plugins/waylandcompositors/xcomposite-glx/main.cpp
|
||
|
|
index fdc7037..42d676b 100644
|
||
|
|
--- a/src/plugins/waylandcompositors/xcomposite-glx/main.cpp
|
||
|
|
+++ b/src/plugins/waylandcompositors/xcomposite-glx/main.cpp
|
||
|
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||
|
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||
|
|
{
|
||
|
|
Q_OBJECT
|
||
|
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-glx.json")
|
||
|
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "xcomposite-glx.json")
|
||
|
|
public:
|
||
|
|
QStringList keys() const;
|
||
|
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|