From 22ef98c0b11f3d2e48af6adce11d79c5d1cae194 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 24 May 2012 13:41:36 +0300 Subject: Migrate tslib to new plugin format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also rename the binary and avoid crashes when tslib initialization fails. Change-Id: Ia7ccf7c997e1b1484bd475626ca16c9a9642466e Reviewed-by: Samuel Rødal --- src/plugins/generic/tslib/main.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/plugins/generic/tslib/main.cpp') diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp index 1bbc618d6dc..dc043138e9b 100644 --- a/src/plugins/generic/tslib/main.cpp +++ b/src/plugins/generic/tslib/main.cpp @@ -46,6 +46,9 @@ QT_BEGIN_NAMESPACE class QTsLibPlugin : public QGenericPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "tslib.json") + public: QTsLibPlugin(); @@ -71,8 +74,8 @@ QObject* QTsLibPlugin::create(const QString &key, if (!key.compare(QLatin1String("Tslib"), Qt::CaseInsensitive) || !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive)) return new QTsLibMouseHandler(key, specification); return 0; - } - -Q_EXPORT_PLUGIN2(qtslibplugin, QTsLibPlugin) +} QT_END_NAMESPACE + +#include "main.moc" -- cgit v1.2.3