From e84cfbfcfa7ab75bc298588984446efac6f0ac57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Thu, 14 Apr 2011 10:00:18 +0200 Subject: Fix warning about initialization order Merge-request: 916 Reviewed-by: Thierry Bastian (cherry picked from commit f7b60fffb673b182e633545bffd1d310337aca50) --- src/gui/widgets/qmenu_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index 005ce1d6ee..9fd55cabde 100644 --- a/src/gui/widgets/qmenu_p.h +++ b/src/gui/widgets/qmenu_p.h @@ -154,6 +154,9 @@ public: #endif scroll(0), eventLoop(0), tearoff(0), tornoff(0), tearoffHighlighted(0), hasCheckableItems(0), sloppyAction(0), doChildEffects(false) +#ifdef QT3_SUPPORT + ,emitHighlighted(false) +#endif #ifdef Q_WS_MAC ,mac_menu(0) #endif @@ -162,9 +165,6 @@ public: #endif #ifdef Q_WS_S60 ,symbian_menu(0) -#endif -#ifdef QT3_SUPPORT - ,emitHighlighted(false) #endif { } ~QMenuPrivate() -- cgit v1.2.3