diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-14 22:02:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-14 22:02:58 (GMT) |
| commit | e3fcf351dee44b4f9457a6abbed76d37fc0fbe67 (patch) | |
| tree | 2c5e0a4eaedbfa1aa8145b6aef6bdd93a38f92fb /src/gui/widgets | |
| parent | f36d2e5cd0655cee2a1bfb84a66400a4b7a4c454 (diff) | |
| parent | ae3f20e9ce7f592c22c23e8dea6bb9feb52c8b90 (diff) | |
| download | Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.zip Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.tar.gz Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tools/macdeployqt/shared/shared.cpp
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu_wince.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu_wince.cpp b/src/gui/widgets/qmenu_wince.cpp index 0befa6d..2ce89f9 100644 --- a/src/gui/widgets/qmenu_wince.cpp +++ b/src/gui/widgets/qmenu_wince.cpp @@ -214,7 +214,7 @@ static HWND qt_wce_create_menubar(HWND parentHandle, HINSTANCE resourceHandle, i mbi.nToolBarId = toolbarID; if (ptrCreateMenuBar(&mbi)) { -#ifdef Q_WS_WINCE_WM +#ifdef Q_OS_WINCE_WM // Tell the menu bar that we want to override hot key behaviour. LPARAM lparam = MAKELPARAM(SHMBOF_NODEFAULT | SHMBOF_NOTIFY, SHMBOF_NODEFAULT | SHMBOF_NOTIFY); |