1 files changed, 11 insertions, 13 deletions
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 27bd217..92c2969 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -43,7 +43,6 @@
 #define QDECLARATIVEVIEWER_H
 
 #include <QMainWindow>
-#include <QMenuBar>
 #include <private/qdeclarativetimer_p.h>
 #include <QTime>
 #include <QList>
@@ -62,17 +61,17 @@ class QNetworkReply;
 class QNetworkCookieJar;
 class NetworkAccessManagerFactory;
 class QTranslator;
+class QActionGroup;
 
 class QDeclarativeViewer
-#if defined(Q_OS_SYMBIAN)
     : public QMainWindow
-#else
-    : public QWidget
-#endif
 {
-Q_OBJECT
+    Q_OBJECT
+    QDeclarativeViewer(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    static QDeclarativeViewer *inst;
+
 public:
-    QDeclarativeViewer(QWidget *parent=0, Qt::WindowFlags flags=0);
+    static QDeclarativeViewer *instance(QWidget *parent = 0, Qt::WindowFlags flags = 0);
     ~QDeclarativeViewer();
 
     static void registerTypes();
@@ -103,11 +102,8 @@ public:
     void addPluginPath(const QString& plugin);
     void setUseGL(bool use);
     void setUseNativeFileBrowser(bool);
-    void updateSizeHints();
     void setSizeToView(bool sizeToView);
 
-    QMenuBar *menuBar() const;
-
     QDeclarativeView *view() const;
     LoggerWidget *warningsWidget() const;
 
@@ -132,9 +128,11 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual bool event(QEvent *);
-    void createMenu(QMenuBar *menu, QMenu *flatmenu);
+    void createMenu();
 
 private slots:
+    void appAboutToQuit();
+
     void autoStartRecording();
     void autoStopRecording();
     void recordFrame();
@@ -148,9 +146,10 @@ private slots:
     void warningsWidgetOpened();
     void warningsWidgetClosed();
 
+    void updateSizeHints();
+
 private:
     QString getVideoFileName();
-    int menuBarHeight() const;
 
     LoggerWidget *loggerWindow;
     QDeclarativeView *canvas;
@@ -173,7 +172,6 @@ private:
     QAction *recordAction;
     QString currentSkin;
     bool scaleSkin;
-    mutable QMenuBar *mb;
     RecordingDialog *recdlg;
 
     void senseImageMagick();