From 194d2ca5c3bbf7e5c06a5f8e4fbbbc8e1247f549 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Tue, 7 Feb 2012 14:23:50 +0100 Subject: 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 Reviewed-by: Friedemann Kleint --- src/widgets/widgets/qmenubar_p.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/widgets/widgets/qmenubar_p.h') 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 // 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 { -- cgit v1.2.3