diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-02-07 14:23:50 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 20:04:44 +0100 |
| commit | 194d2ca5c3bbf7e5c06a5f8e4fbbbc8e1247f549 (patch) | |
| tree | 17d8244de34dbfe51fe44fee18630487face84ea /src/widgets/widgets/qmenubar_p.h | |
| parent | 3cb871241a727193b17b1e0f28a5a9ba87f61d36 (diff) | |
Use Q_OS_WINCE instead of Q_WS_WINCE
Window system defines have been deprecated,
so use Q_OS_WINCE instead.
Change-Id: I52059d0f854fe783ac20610ab248800c3e1e827c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qmenubar_p.h')
| -rw-r--r-- | src/widgets/widgets/qmenubar_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h index a15a1e432e..1af94bb236 100644 --- a/src/widgets/widgets/qmenubar_p.h +++ b/src/widgets/widgets/qmenubar_p.h @@ -57,7 +57,7 @@ #include "QtWidgets/qstyleoption.h" #include <private/qmenu_p.h> // Mac needs what in this file! -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE #include "qguifunctions_wince.h" #endif @@ -73,14 +73,14 @@ public: closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0), nativeMenuBar(-1), doChildEffects(false), platformMenuBar(0) -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE , wce_menubar(0), wceClassicMenu(false) #endif { } ~QMenuBarPrivate() { delete platformMenuBar; -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE delete wce_menubar; #endif } @@ -124,7 +124,7 @@ public: void _q_internalShortcutActivated(int); void _q_updateLayout(); -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE void _q_updateDefaultAction(); #endif @@ -150,7 +150,7 @@ public: QBasicTimer autoReleaseTimer; QPlatformMenuBar *platformMenuBar; -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE void wceCreateMenuBar(QWidget *); void wceDestroyMenuBar(); struct QWceMenuBarPrivate { |