summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2010-02-17 15:09:42 (GMT)
committerhjk <qtc-committer@nokia.com>2010-02-18 14:09:20 (GMT)
commitfa1b0faa1ede809dae3c46ecfce0ef760b887b7c (patch)
tree197651c364f763b9a43e22d5f5bafc6c5d69eb3d /tools
parent21df89dae6c0646ec5066efaea0ec2986c7c4588 (diff)
downloadQt-fa1b0faa1ede809dae3c46ecfce0ef760b887b7c.zip
Qt-fa1b0faa1ede809dae3c46ecfce0ef760b887b7c.tar.gz
Qt-fa1b0faa1ede809dae3c46ecfce0ef760b887b7c.tar.bz2
Compile fix with namepaces
Task-number: QTBUG-8205
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlviewer/qmlviewer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 3cfbee2..cb1bef4 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -135,10 +135,10 @@ QT_END_NAMESPACE
QML_DECLARE_TYPE(Screen)
-QT_BEGIN_NAMESPACE
-
QML_DEFINE_TYPE(QmlViewer, 1, 0, Screen, Screen)
+QT_BEGIN_NAMESPACE
+
class SizedMenuBar : public QMenuBar
{
Q_OBJECT