1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take advantage of the Qt 5 plugin json structure

Browse Source 
Also change naming scheme of plugins:
buffer integrations doesn't start with "wayland-" but the platform
plugins have to start with "wayland-".

Also update the README

Change-Id: I6dd2103ab287ed569ab06cfb6eb469e3db058831
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Jorgen Lind 2014-03-10 14:31:55 +01:00 committed by The Qt Project
parent 982cef3480
commit 1706b46194
8 changed files with 23 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/brcm-egl.json
View File

@ -1,3 +1,3 @@
{ {
"Keys": [ "wayland-brcm" ] "Keys": [ "brcm" ]
} }

16
src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/main.cpp
View File

@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE
class QWaylandBrcmEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin class QWaylandBrcmEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "brcm-egl.json") Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json")
public: public:
QStringList keys() const; QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
}; };
QStringList QWaylandBrcmEglClientBufferPlugin::keys() const
{
QStringList list;
list << "wayland-brcm";
return list;
}
QWaylandClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const QString& system, const QStringList& paramList) QWaylandClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const QString& system, const QStringList& paramList)
{ {
Q_UNUSED(paramList); Q_UNUSED(paramList);
if (system.toLower() == "wayland-brcm") Q_UNUSED(system);
return new QWaylandBrcmEglIntegration(); return new QWaylandBrcmEglIntegration();
return 0;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

16
src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/main.cpp
View File

@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE
class DrmEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin class DrmEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandServerBufferIntegrationFactoryInterface.5.3" FILE "drm-egl-server.json") Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json")
public: public:
QStringList keys() const; QWaylandServerBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
QWaylandServerBufferIntegration *create(const QString&, const QStringList&);
}; };
QStringList DrmEglServerBufferPlugin::keys() const
{
QStringList list;
list << "drm-egl-server";
return list;
}
QWaylandServerBufferIntegration *DrmEglServerBufferPlugin::create(const QString& system, const QStringList& paramList) QWaylandServerBufferIntegration *DrmEglServerBufferPlugin::create(const QString& system, const QStringList& paramList)
{ {
Q_UNUSED(paramList); Q_UNUSED(paramList);
if (system.toLower() == "drm-egl-server") Q_UNUSED(system);
return new DrmEglServerBufferIntegration(); return new DrmEglServerBufferIntegration();
return 0;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

16
src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp
View File

@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE
class QWaylandEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin class QWaylandEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "wayland-egl.json") Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json")
public: public:
QStringList keys() const; QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
}; };
QStringList QWaylandEglClientBufferPlugin::keys() const
{
QStringList list;
list << "wayland-egl";
return list;
}
QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QString& system, const QStringList& paramList) QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QString& system, const QStringList& paramList)
{ {
Q_UNUSED(paramList); Q_UNUSED(paramList);
if (system.toLower() == "wayland-egl") Q_UNUSED(system);
return new QWaylandEglClientBufferIntegration(); return new QWaylandEglClientBufferIntegration();
return 0;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

16
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/main.cpp
View File

@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE
class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-egl.json") Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json")
public: public:
QStringList keys() const; QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
}; };
QStringList QWaylandXCompositeEglClientBufferIntegrationPlugin::keys() const
{
QStringList list;
list << "xcomposite" << "xcomposite-egl";
return list;
}
QWaylandClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) QWaylandClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
{ {
Q_UNUSED(paramList); Q_UNUSED(paramList);
if (system.toLower() == "xcomposite" || system.toLower() == "xcomposite-egl") Q_UNUSED(system);
return new QWaylandXCompositeEGLClientBufferIntegration(); return new QWaylandXCompositeEGLClientBufferIntegration();
return 0;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/xcomposite-egl.json
View File

@ -1,3 +1,3 @@
{ {
"Keys": [ "wayland-xcomposite" ] "Keys": [ "xcomposite-egl" ]
} }

16
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/main.cpp
View File

@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE
class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-glx.json") Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json")
public: public:
QStringList keys() const; QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
}; };
QStringList QWaylandXCompositeGlxClientBufferIntegrationPlugin::keys() const
{
QStringList list;
list << "wayland-xcomposite-glx";
return list;
}
QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
{ {
Q_UNUSED(paramList); Q_UNUSED(paramList);
if (system.toLower() == "wayland-xcomposite-glx") Q_UNUSED(system);
return new QWaylandXCompositeGLXIntegration(); return new QWaylandXCompositeGLXIntegration();
return 0;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/xcomposite-glx.json
View File

@ -1,3 +1,3 @@
{ {
"Keys": [ "wayland-xcomposite-glx" ] "Keys": [ "xcomposite-glx" ]
} }