Merge remote branch 'origin/4.7' into lighthouse

Conflicts:
	configure
	src/gui/kernel/qapplication.cpp
	src/gui/painting/qbackingstore.cpp
	src/opengl/qgl.cpp
	src/opengl/qgl_p.h
	src/plugins/plugins.pro
	tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
	tools/tools.pro

1 files changed, 7 insertions, 5 deletions

diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 01777bd..2089dda 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -81,7 +81,8 @@ public:
         TestErrorProperty = 0x00000008,
         SaveOnExit = 0x00000010,
         ExitOnComplete = 0x00000020,
-        ExitOnFailure = 0x00000040
+        ExitOnFailure = 0x00000040,
+        Snapshot = 0x00000080
     };
     Q_DECLARE_FLAGS(ScriptOptions, ScriptOption)
     void setScript(const QString &s) { m_script = s; }
@@ -96,6 +97,7 @@ public:
     void setDeviceKeys(bool);
     void setNetworkCacheSize(int size);
     void addLibraryPath(const QString& lib);
+    void addPluginPath(const QString& plugin);
     void setUseGL(bool use);
     void setUseNativeFileBrowser(bool);
 
@@ -103,11 +105,11 @@ public:
 
     QMenuBar *menuBar() const;
 
+    QDeclarativeView *view() const;
+
 public slots:
     void sceneResized(QSize size);
-    void open(const QString&);
-    void openWgt(const QString&);
-    void openQml(const QString&);
+    bool open(const QString&);
     void openFile();
     void reload();
     void takeSnapShot();
@@ -124,6 +126,7 @@ public slots:
 
 protected:
     virtual void keyPressEvent(QKeyEvent *);
+    virtual bool event(QEvent *);
 
     void createMenu(QMenuBar *menu, QMenu *flatmenu);
 
@@ -139,7 +142,6 @@ private slots:
     void toggleOrientation();
     void startNetwork();
     void toggleFullScreen();
-    void unpackWgt();
 
 private:
     QString getVideoFileName();