diff options
| author | Aurélien Gâteau <agateau@kde.org> | 2011-04-14 08:00:18 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-04-14 08:00:18 (GMT) |
| commit | f7b60fffb673b182e633545bffd1d310337aca50 (patch) | |
| tree | ae75698911bcf6fe469e5b6e7fdcefed58b15d12 /src/gui | |
| parent | b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 (diff) | |
| download | Qt-f7b60fffb673b182e633545bffd1d310337aca50.zip Qt-f7b60fffb673b182e633545bffd1d310337aca50.tar.gz Qt-f7b60fffb673b182e633545bffd1d310337aca50.tar.bz2 | |
Fix warning about initialization order
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qmenu_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index 005ce1d..9fd55ca 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 @@ -163,9 +166,6 @@ public: #ifdef Q_WS_S60 ,symbian_menu(0) #endif -#ifdef QT3_SUPPORT - ,emitHighlighted(false) -#endif { } ~QMenuPrivate() { |