diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-10 12:56:11 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-10 12:56:11 (GMT) |
| commit | 19e19142d8a56ba880dca869c5721ea8f72fea16 (patch) | |
| tree | ba18b0ac8ec954bc905af5a9adb1be00b6da1bbc /src/imports/gestures/plugin.cpp | |
| parent | 95fcfccf3c6d9d102fa1c5481e6be52a21749af6 (diff) | |
| parent | 7101ae5a0e90d97acf86a444c4d51ca45e7863fe (diff) | |
| download | Qt-19e19142d8a56ba880dca869c5721ea8f72fea16.zip Qt-19e19142d8a56ba880dca869c5721ea8f72fea16.tar.gz Qt-19e19142d8a56ba880dca869c5721ea8f72fea16.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/imports/gestures/plugin.cpp')
| -rw-r--r-- | src/imports/gestures/plugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp index 11f2392..1fc23ca 100644 --- a/src/imports/gestures/plugin.cpp +++ b/src/imports/gestures/plugin.cpp @@ -53,7 +53,9 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.gestures")); +#ifndef QT_NO_GESTURES qmlRegisterCustomType<QDeclarativeGestureArea>(uri,1,0, "GestureArea", new QDeclarativeGestureAreaParser); +#endif } }; @@ -62,4 +64,3 @@ QT_END_NAMESPACE #include "plugin.moc" Q_EXPORT_PLUGIN2(qmlgesturesplugin, QT_PREPEND_NAMESPACE(GestureAreaQmlPlugin)); - |