diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2014-03-10 14:31:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-11 15:35:18 +0100 |
| commit | 043a2893c41bbe0daa8953e9e30dd6957f216d95 (patch) | |
| tree | 605fef066399c3678a34d6d442a20281d1c3bcd1 /src/plugins/platforms/qwayland-xcomposite-glx | |
| parent | 6b173d993542e2aed01b5a97d3e0fb64940ad432 (diff) | |
Take advantage of the Qt 5 plugin json structure
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>
Diffstat (limited to 'src/plugins/platforms/qwayland-xcomposite-glx')
| -rw-r--r-- | src/plugins/platforms/qwayland-xcomposite-glx/main.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp index 2f43b467b..fb2b1414e 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp @@ -49,26 +49,16 @@ QT_BEGIN_NAMESPACE class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-xcomposite-glx.json") + Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-glx.json") public: - QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); }; -QStringList QWaylandIntegrationPlugin::keys() const -{ - QStringList list; - list << "wayland-xcomposite-glx"; - return list; -} - QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-xcomposite-glx") - return new QWaylandXCompositeGlxPlatformIntegration(); - - return 0; + Q_UNUSED(system); + return new QWaylandXCompositeGlxPlatformIntegration(); } QT_END_NAMESPACE |