diff options
| author | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
| commit | dd1a2ad2eb40afd29d418cdf54544d110d39dc25 (patch) | |
| tree | 2d17f5a85f6bc38e1dd80d3ea09800aff0af29b0 /src/corelib/global/qnamespace.h | |
| parent | 76bcd00f74b0977b5f6ce12295aae987ea9ad4c1 (diff) | |
| parent | fd30747b5b54a760ca280ad1e75ce87026478f5e (diff) | |
| download | Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.zip Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.gz Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
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 38e1886..177bee4 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -497,6 +497,9 @@ public: WA_WState_AcceptedTouchBeginEvent = 122, WA_TouchPadAcceptSingleTouchEvents = 123, + WA_MergeSoftkeys = 124, + WA_MergeSoftkeysRecursively = 125, + // Add new attributes before this line WA_AttributeCount }; |