Use the new plugin system in the KMS plugin.

Sync up the KMS QPA plugin with the plugin system changes.

Change-Id: Ifaa8be6f11aeb93acc63643c62ca15db4e9bc38f
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
This commit is contained in:
Hannu Lyytinen 2012-04-10 16:12:21 +03:00 committed by Qt by Nokia
parent 9cdfeb2b84
commit c343f710f4
3 changed files with 14 additions and 16 deletions

View File

@ -0,0 +1,3 @@
{
"Keys": [ "kms" ]
}

View File

@ -1,11 +1,12 @@
TARGET = qkms TARGET = qkms
load(qt_plugin) load(qt_plugin)
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
QT = core-private gui-private platformsupport-private opengl-private QT += core-private gui-private platformsupport-private opengl-private
DESTDIR = $$QT.gui.plugins/platforms
CONFIG += link_pkgconfig qpa/genericunixfontdatabase DEFINES += MESA_EGL_NO_X11_HEADERS
CONFIG += link_pkgconfig egl qpa/genericunixfontdatabase
PKGCONFIG += libdrm egl gbm glesv2 PKGCONFIG += libdrm egl gbm glesv2
@ -30,13 +31,5 @@ HEADERS = qkmsintegration.h \
target.path += $$[QT_INSTALL_PLUGINS]/platforms target.path += $$[QT_INSTALL_PLUGINS]/platforms
INSTALLS += target INSTALLS += target
OTHER_FILES += \
kms.json

View File

@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE
class QKmsIntegrationPlugin : public QPlatformIntegrationPlugin class QKmsIntegrationPlugin : public QPlatformIntegrationPlugin
{ {
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "kms.json")
public: public:
QStringList keys() const; QStringList keys() const;
QPlatformIntegration *create(const QString&, const QStringList&); QPlatformIntegration *create(const QString&, const QStringList&);
@ -67,6 +69,6 @@ QPlatformIntegration *QKmsIntegrationPlugin::create(const QString& system, const
return 0; return 0;
} }
Q_EXPORT_PLUGIN2(kms, QKmsIntegrationPlugin)
QT_END_NAMESPACE QT_END_NAMESPACE
#include "main.moc"