diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-06-07 16:10:46 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-06-07 16:10:46 (GMT) |
| commit | d26856959f5031c03ed245df5aa9cb3b15a0596b (patch) | |
| tree | 8484a674a9acb81d18c5a01ef9f2445c2a2a81b0 /src/imports/gestures/plugin.cpp | |
| parent | 0c0f22ec0e36d7001c8195dcc6e390a37118e33e (diff) | |
| parent | bf966d125d5c5fa7719ae9f9110db8742d5a4c85 (diff) | |
| download | Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.zip Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.tar.gz Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-staging1
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)); - |