diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-04 15:21:02 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-04 15:21:02 (GMT) |
commit | 793d3c2da83098e32063c4ae6df187058103bde8 (patch) | |
tree | 7b96581a67bd66ff30b0ede18b0fbfd71d9345cf /src/corelib/global/qnamespace.h | |
parent | 2d0f49df3a3c44601bf2e41ea722c2384b71aab0 (diff) | |
parent | c2d47f6717fdccd44838f3c128693a3c09f6cf68 (diff) | |
download | Qt-793d3c2da83098e32063c4ae6df187058103bde8.zip Qt-793d3c2da83098e32063c4ae6df187058103bde8.tar.gz Qt-793d3c2da83098e32063c4ae6df187058103bde8.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-rw-r--r-- | src/corelib/global/qnamespace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index ed44fa2..1635f8a 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -506,6 +506,7 @@ public: AA_NativeWindows = 3, AA_DontCreateNativeWidgetSiblings = 4, AA_MacPluginApplication = 5, + AA_DontUseNativeMenuBar = 6, // Add new attributes before this line AA_AttributeCount |