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/qmenu_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/qmenu_p.h')
| -rw-r--r-- | src/widgets/widgets/qmenu_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index af236c1c8f..ee6e62653f 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE class QTornOffMenu; class QEventLoop; -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE struct QWceMenuAction { uint command; QPointer<QAction> action; @@ -91,7 +91,7 @@ public: scroll(0), eventLoop(0), tearoff(0), tornoff(0), tearoffHighlighted(0), hasCheckableItems(0), sloppyAction(0), doChildEffects(false), platformMenu(0) -#if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR) +#if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR) ,wce_menu(0) #endif { } @@ -99,7 +99,7 @@ public: { delete scroll; delete platformMenu; -#if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR) +#if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR) delete wce_menu; #endif } @@ -228,7 +228,7 @@ public: QPointer<QAction> actionAboutToTrigger; -#if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR) +#if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR) struct QWceMenuPrivate { QList<QWceMenuAction*> actionItems; HMENU menuHandle; |