diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:57:12 +0100 | 
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-29 00:58:13 +0100 | 
| commit | c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9 (patch) | |
| tree | 7e9802171d7b4c641c2de1ef781023cab5d7d14c /src/plugins/generic/evdevtouch/main.cpp | |
| parent | 7da3a61b5fd5cc726f8fd62691aa5f84c7929800 (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
| download | qtbase-c4ad58ed2252d5ed9f448a5c068ab33dce4cadd9.tar.gz | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c
Diffstat (limited to 'src/plugins/generic/evdevtouch/main.cpp')
| -rw-r--r-- | src/plugins/generic/evdevtouch/main.cpp | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp index 526e336fd8..47b026ac96 100644 --- a/src/plugins/generic/evdevtouch/main.cpp +++ b/src/plugins/generic/evdevtouch/main.cpp @@ -46,6 +46,9 @@ QT_BEGIN_NAMESPACE  class QTouchScreenPlugin : public QGenericPlugin  { +    Q_OBJECT +    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevtouch.json") +  public:      QTouchScreenPlugin(); @@ -71,6 +74,6 @@ QObject* QTouchScreenPlugin::create(const QString &key,      return 0;  } -Q_EXPORT_PLUGIN2(qevdevtouchplugin, QTouchScreenPlugin) -  QT_END_NAMESPACE + +#include "main.moc"  | 
