diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 12:34:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 12:34:04 (GMT) |
| commit | 16bbc29010be59131c792a1f0c08e91c2166ebf0 (patch) | |
| tree | b63c474d28dae5ae2b5b9793cbf70eb5e24c43c3 /src/gui/widgets | |
| parent | b8238ec7e41d483a9166eb7aebbf911f36976cdc (diff) | |
| parent | 66f8bc3b8e2648ee9c0c26c25bc5112ed7d603eb (diff) | |
| download | Qt-16bbc29010be59131c792a1f0c08e91c2166ebf0.zip Qt-16bbc29010be59131c792a1f0c08e91c2166ebf0.tar.gz Qt-16bbc29010be59131c792a1f0c08e91c2166ebf0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix linux-clang license header
Add mkspecs for Clang on Linux and Mac OS X
Handle Objective-C/C++ sources in SOURCES gracefully
configure: Don't use character class when looking for QMAKE_CONF_COMPILER
removed shlobj.h to prevent different redefinitions for Windows Embedded 7
enums are defined as typedefs for Windows Embedded 7
windef.h needs to be include before types.h for Windows Embedded 7
defines GID_* for Windows Embedded 7
WM_GESTURE and WM_GESTURENOTIFY are not defined together for Windows Embedded 7
SPI_GETPLATFORMTYPE not defined for Windows Embedded 7
Make QCompleter return current parent instead of invalid index
make QFileDialog completer return proper dirnames in root
Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.
Designer: Enable morphing into QTextBrowser.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h index 7708e05..77f3b1a 100644 --- a/src/gui/widgets/qmenu.h +++ b/src/gui/widgets/qmenu.h @@ -51,6 +51,10 @@ #include <QtGui/qpixmap.h> #endif +#ifdef Q_WS_WINCE +#include <windef.h> // for HMENU +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |