Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (131 commits)
  Avoid many unnecessary allocations, so so that paint engines attached to pixmaps
  Doc
  Fix autotests
  Fix autotests (remove import Qt.widgets)
  Add missing qml file to qdeclarativemousearea
  Doc fix
  Clean up example code, add white background behind text
  Update mouse area qmlvisual test to follow change QTBUG-10162
  Fix autotest bug in MouseArea
  Avoid emitting release when the mouse is ungrabbed
  Resize qmlruntime window to new dimensions when orientation changes
  Compile with opengl enabled.
  Avoid repeated create/destroy at top list boundary with sub-pixel movement.
  Call QDeclarativeItem::geometryChanged() base implementation
  qdoc fixes.
  Avoid warnings as delegates with bindings to parent are created and destroyed.
  qdoc fixes
  TextInput echoMode doc.
  Make sure to call base class implementation.
  More cleanup
  ...

1 files changed, 18 insertions, 3 deletions

diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 2a0a07d..9551090 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -48,6 +48,8 @@
 #include <QTime>
 #include <QList>
 
+#include "loggerwidget.h"
+
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeView;
@@ -59,6 +61,7 @@ class QDeclarativeTester;
 class QNetworkReply;
 class QNetworkCookieJar;
 class NetworkAccessManagerFactory;
+class QTranslator;
 
 class QDeclarativeViewer
 #if defined(Q_OS_SYMBIAN)
@@ -107,6 +110,7 @@ public:
     QMenuBar *menuBar() const;
 
     QDeclarativeView *view() const;
+    LoggerWidget *warningsWidget() const;
 
 public slots:
     void sceneResized(QSize size);
@@ -121,6 +125,7 @@ public slots:
     void showProxySettings ();
     void proxySettingsChanged ();
     void setScaleView();
+    void toggleOrientation();
     void statusChanged();
     void setSlowMode(bool);
     void launch(const QString &);
@@ -128,7 +133,6 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual bool event(QEvent *);
-
     void createMenu(QMenuBar *menu, QMenu *flatmenu);
 
 private slots:
@@ -140,14 +144,19 @@ private slots:
     void setScaleSkin();
     void setPortrait();
     void setLandscape();
-    void toggleOrientation();
     void startNetwork();
     void toggleFullScreen();
+    void orientationChanged();
+
+    void showWarnings(bool show);
+    void warningsWidgetOpened();
+    void warningsWidgetClosed();
 
 private:
     QString getVideoFileName();
     int menuBarHeight() const;
 
+    LoggerWidget *loggerWindow;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
     QDeclarativeView *canvas;
@@ -182,16 +191,22 @@ private:
     QAction *portraitOrientation;
     QAction *landscapeOrientation;
 
+    QAction *showWarningsWindow;
+
     QString m_script;
     ScriptOptions m_scriptOptions;
     QDeclarativeTester *tester;
 
     QNetworkReply *wgtreply;
     QString wgtdir;
-
     NetworkAccessManagerFactory *namFactory;
 
     bool useQmlFileBrowser;
+
+    QTranslator *translator;
+    void loadTranslationFile(const QString& directory);
+
+    void loadDummyDataFiles(const QString& directory);
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeViewer::ScriptOptions)