diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
| commit | 36bd47429312f6d78d620c04bb7e62d34273d310 (patch) | |
| tree | dea54adff0ec870a88d96e7e3bb00b9657175412 /src/imports | |
| parent | 00ebbeb5c319957d5671130313da3c5485e0f31c (diff) | |
| parent | 2737386ebcb99715d3198a91b5951415c24f99aa (diff) | |
| download | Qt-36bd47429312f6d78d620c04bb7e62d34273d310.zip Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.gz Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/gestures/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/imports/gestures/qdeclarativegesturearea_p.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp index 9f5d923..b8a9751 100644 --- a/src/imports/gestures/plugin.cpp +++ b/src/imports/gestures/plugin.cpp @@ -53,8 +53,7 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.gestures")); - qmlRegisterCustomType<QDeclarativeGestureArea>(uri,1,0, "GestureArea", "QDeclarativeGestureArea", - new QDeclarativeGestureAreaParser); + qmlRegisterCustomType<QDeclarativeGestureArea>(uri,1,0, "GestureArea", new QDeclarativeGestureAreaParser); } }; diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h index 8e2c066..0195511 100644 --- a/src/imports/gestures/qdeclarativegesturearea_p.h +++ b/src/imports/gestures/qdeclarativegesturearea_p.h @@ -59,7 +59,7 @@ QT_MODULE(Declarative) class QDeclarativeBoundSignal; class QDeclarativeContext; class QDeclarativeGestureAreaPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeGestureArea : public QDeclarativeItem +class QDeclarativeGestureArea : public QDeclarativeItem { Q_OBJECT |