summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenubar_p.h
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2009-05-11 17:37:45 (GMT)
committerIain <qt-info@nokia.com>2009-05-11 17:37:45 (GMT)
commit4592301363ad625e583b76b2f46f616486e5d0d6 (patch)
tree061d87dcacc338c1f0423fe73bca219ead704b09 /src/gui/widgets/qmenubar_p.h
parentdabd8caa4a2faffefbc7f9bb4f233283458c779e (diff)
parent7aec9035cb0e23eecfdcec9e441092a485ca7f0a (diff)
downloadQt-4592301363ad625e583b76b2f46f616486e5d0d6.zip
Qt-4592301363ad625e583b76b2f46f616486e5d0d6.tar.gz
Qt-4592301363ad625e583b76b2f46f616486e5d0d6.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/widgets/qmenubar_p.h')
-rw-r--r--src/gui/widgets/qmenubar_p.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index f617d80..d562cd9 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -61,14 +61,17 @@
#include "qguifunctions_wince.h"
#endif
-QT_BEGIN_NAMESPACE
-
#ifndef QT_NO_MENUBAR
-class QMenuBarExtension;
#ifdef Q_OS_SYMBIAN
class CCoeControl;
class CEikMenuBar;
#endif
+#endif
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_MENUBAR
+class QMenuBarExtension;
class QMenuBarPrivate : public QWidgetPrivate
{
Q_DECLARE_PUBLIC(QMenuBar)