diff options
| author | Aurélien Gâteau <agateau@kde.org> | 2010-11-10 21:58:18 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-06-20 10:27:15 (GMT) |
| commit | b4ddcbbf1ce067a823815c07a357a065be731d48 (patch) | |
| tree | 51c97a02526ba73c8a6415829593caa4f0bbc974 /src/gui/widgets/qmenu_p.h | |
| parent | 04b98a8737ecf8629fa15823495f9756a2f0eb0e (diff) | |
| download | Qt-b4ddcbbf1ce067a823815c07a357a065be731d48.zip Qt-b4ddcbbf1ce067a823815c07a357a065be731d48.tar.gz Qt-b4ddcbbf1ce067a823815c07a357a065be731d48.tar.bz2 | |
Fix warning about initialization order
Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Diffstat (limited to 'src/gui/widgets/qmenu_p.h')
| -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 0e63799..82bd932 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() { |