diff options
author | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
commit | 1c48ec8f4876db0b4c7b86dd19ab8bb27c082786 (patch) | |
tree | 8ca2723a27ae670b3e84dfb21b6a3a28d3bbe401 /src/corelib/global | |
parent | 0374c15075f98b0b4efbb1c00ef3812b67fabe0f (diff) | |
parent | ade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff) | |
download | Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.zip Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.gz Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qnamespace.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 35ff8e7..6ee8ae9 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1725,7 +1725,8 @@ public: enum GestureFlag { DontStartGestureOnChildren = 0x01, - ReceivePartialGestures = 0x02 + ReceivePartialGestures = 0x02, + IgnoredGesturesPropagateToParent = 0x04 }; Q_DECLARE_FLAGS(GestureFlags, GestureFlag) diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 1f1c8f7..db910ce 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -42,6 +42,7 @@ /*! \namespace Qt \inmodule QtCore + \target Qt Namespace \brief The Qt namespace contains miscellaneous identifiers used throughout the Qt library. |