From a5c1ffedb8aceaa69bb27f999cf3ead205a86a54 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Sat, 10 Mar 2012 16:17:27 -0800 Subject: Convert xlib plugin to new format Change-Id: I00418a1eb7bf944ec360dbbb1f61f7703f3ecd37 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/xlib/main.cpp | 6 ++++-- src/plugins/platforms/xlib/xlib.json | 3 +++ src/plugins/platforms/xlib/xlib.pro | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/plugins/platforms/xlib/xlib.json (limited to 'src/plugins') diff --git a/src/plugins/platforms/xlib/main.cpp b/src/plugins/platforms/xlib/main.cpp index 6030a72236..95c4d9e4d8 100644 --- a/src/plugins/platforms/xlib/main.cpp +++ b/src/plugins/platforms/xlib/main.cpp @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE class QXlibIntegrationPlugin : public QPlatformIntegrationPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "xlib.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); @@ -67,6 +69,6 @@ QPlatformIntegration* QXlibIntegrationPlugin::create(const QString& system, cons return 0; } -Q_EXPORT_PLUGIN2(xlib, QXlibIntegrationPlugin) - QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/platforms/xlib/xlib.json b/src/plugins/platforms/xlib/xlib.json new file mode 100644 index 0000000000..524be2fc6d --- /dev/null +++ b/src/plugins/platforms/xlib/xlib.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "xlib" ] +} diff --git a/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro index ea95ae83a1..463130a64b 100644 --- a/src/plugins/platforms/xlib/xlib.pro +++ b/src/plugins/platforms/xlib/xlib.pro @@ -32,6 +32,8 @@ HEADERS = \ qxlibdisplay.h \ qxlibnativeinterface.h +OTHER_FILES += xlib.json + LIBS += -lX11 -lXext mac { -- cgit v1.2.3