diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 11:10:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 11:10:05 (GMT) |
| commit | b401ad3ad0448a9893d1d383ad47769ebc9025ff (patch) | |
| tree | b45225ee6198d2b054ad54b6002c4438607e3cf0 /src/corelib/global/qnamespace.h | |
| parent | 3124d14be27766ddf3c86528c913165e09317111 (diff) | |
| parent | 1d5bc6d586445c477823e4f7fe03530634bf869d (diff) | |
| download | Qt-b401ad3ad0448a9893d1d383ad47769ebc9025ff.zip Qt-b401ad3ad0448a9893d1d383ad47769ebc9025ff.tar.gz Qt-b401ad3ad0448a9893d1d383ad47769ebc9025ff.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed the scope when evaluating GestureArea javascript expressions
Report errors when evaluating JavaScript expressions from the GestureArea QML plugin.
Register a few gesture-related types in the meta-type system.
Update Polish translations
Updated changes-4.7.0.
Update changes-4.7.0.
doc: Fixed broken "Getting Started" link.
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index a12e121..68702c4 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -90,6 +90,9 @@ Qt { Q_ENUMS(InputMethodHint) Q_FLAGS(WindowFlags WindowStates InputMethodHints) Q_ENUMS(ConnectionType) +#ifndef QT_NO_GESTURES + Q_ENUMS(GestureState) +#endif #endif // (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN)) #if defined(Q_MOC_RUN) |