diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-05-24 13:41:36 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 03:15:52 +0200 |
| commit | 22ef98c0b11f3d2e48af6adce11d79c5d1cae194 (patch) | |
| tree | f09b7cc0eb7fb7c59ce3d05e56ab0a515dc4ed8e /src/plugins/generic/tslib/main.cpp | |
| parent | dacc3f28521452fcdff3663a7d51cf2ff37311ff (diff) | |
Migrate tslib to new plugin format
Also rename the binary and avoid crashes when tslib initialization
fails.
Change-Id: Ia7ccf7c997e1b1484bd475626ca16c9a9642466e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/generic/tslib/main.cpp')
| -rw-r--r-- | src/plugins/generic/tslib/main.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp index 1bbc618d6d..dc043138e9 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" |