Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	tools/assistant/tools/assistant/centralwidget.cpp
	tools/assistant/tools/assistant/helpviewer_qwv.cpp
	tools/assistant/tools/assistant/helpviewer_qwv.h
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf

1 files changed, 39 insertions, 40 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 9ccc3d2..380f5cc 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -54,7 +54,7 @@
 
 QT_USE_NAMESPACE
 
-QtMsgHandler systemMsgOutput;
+QtMsgHandler systemMsgOutput = 0;
 
 #if defined (Q_OS_SYMBIAN)
 #include <unistd.h>
@@ -86,7 +86,7 @@ QString warnings;
 void showWarnings()
 {
     if (!warnings.isEmpty()) {
-        QMessageBox::warning(0, QApplication::tr("Qt Declarative UI Runtime"), warnings);
+        QMessageBox::warning(0, QApplication::tr("Qt QML Launcher"), warnings);
     }
 }
 
@@ -118,14 +118,11 @@ void usage()
     qWarning("  -frameless ............................... run with no window frame");
     qWarning("  -maximized................................ run maximized");
     qWarning("  -fullscreen............................... run fullscreen");
-    qWarning("  -stayontop................................ keep viewer window on top");
-    qWarning("  -skin <qvfbskindir> ...................... run with a skin window frame");
-    qWarning("                                             \"list\" for a list of built-ins");
-    qWarning("  -resizeview .............................. resize the view, not the skin");
+    qWarning("  -stayontop................................ keep launcher window on top");
     qWarning("  -sizeviewtorootobject .................... the view resizes to the changes in the content");
     qWarning("  -sizerootobjecttoview .................... the content resizes to the changes in the view");
     qWarning("  -qmlbrowser .............................. use a QML-based file browser");
-    qWarning("  -nolog ................................... do not show log window");
+    qWarning("  -warnings [show|hide]..................... show warnings in a separate log window");
     qWarning("  -recordfile <output> ..................... set video recording file");
     qWarning("                                              - ImageMagick 'convert' for GIF)");
     qWarning("                                              - png file for raw frames");
@@ -160,14 +157,16 @@ void scriptOptsUsage()
     qWarning("  testerror ................................ test 'error' property of root item on playback");
     qWarning("  snapshot ................................. file being recorded is static,");
     qWarning("                                             only one frame will be recorded or tested");
-    qWarning("  exitoncomplete ........................... cleanly exit the viewer on script completion");
-    qWarning("  exitonfailure ............................ immediately exit the viewer on script failure");
-    qWarning("  saveonexit ............................... save recording on viewer exit");
+    qWarning("  exitoncomplete ........................... cleanly exit the launcher on script completion");
+    qWarning("  exitonfailure ............................ immediately exit the launcher on script failure");
+    qWarning("  saveonexit ............................... save recording on launcher exit");
     qWarning(" ");
     qWarning(" One of record, play or both must be specified.");
     exit(1);
 }
 
+enum WarningsConfig { ShowWarnings, HideWarnings, DefaultWarnings };
+
 int main(int argc, char ** argv)
 {
 #if defined (Q_OS_SYMBIAN)
@@ -198,7 +197,7 @@ int main(int argc, char ** argv)
 #endif
 
     QApplication app(argc, argv);
-    app.setApplicationName("QtQmlRuntime");
+    app.setApplicationName("QtQmlLauncher");
     app.setOrganizationName("Nokia");
     app.setOrganizationDomain("nokia.com");
 
@@ -207,7 +206,6 @@ int main(int argc, char ** argv)
     QDeclarativeFolderListModel::registerTypes();
 
     bool frameless = false;
-    bool resizeview = false;
     QString fileName;
     double fps = 0;
     int autorecord_from = 0;
@@ -217,7 +215,6 @@ int main(int argc, char ** argv)
     QStringList recordargs;
     QStringList imports;
     QStringList plugins;
-    QString skin;
     QString script;
     QString scriptopts;
     bool runScript = false;
@@ -229,7 +226,9 @@ int main(int argc, char ** argv)
     bool stayOnTop = false;
     bool maximized = false;
     bool useNativeFileBrowser = true;
-    bool showLogWidget = true;
+    bool experimentalGestures = false;
+
+    WarningsConfig warningsConfig = DefaultWarnings;
     bool sizeToView = true;
 
 #if defined(Q_OS_SYMBIAN)
@@ -248,11 +247,6 @@ int main(int argc, char ** argv)
             fullScreen = true;
         } else if (arg == "-stayontop") {
             stayOnTop = true;
-        } else if (arg == "-skin") {
-            if (lastArg) usage();
-            skin = QString(argv[++i]);
-        } else if (arg == "-resizeview") {
-            resizeview = true;
         } else if (arg == "-netcache") {
             if (lastArg) usage();
             cache = QString(argv[++i]).toInt();
@@ -281,7 +275,7 @@ int main(int argc, char ** argv)
             if (lastArg) usage();
             app.setStartDragDistance(QString(argv[++i]).toInt());
         } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) {
-            qWarning("Qt Qml Runtime version %s", QT_VERSION_STR);
+            qWarning("Qt QML Launcher version %s", QT_VERSION_STR);
             exit(0);
         } else if (arg == "-translation") {
             if (lastArg) usage();
@@ -290,8 +284,16 @@ int main(int argc, char ** argv)
             useGL = true;
         } else if (arg == "-qmlbrowser") {
             useNativeFileBrowser = false;
-        } else if (arg == "-nolog") {
-            showLogWidget = false;
+        } else if (arg == "-warnings") {
+            if (lastArg) usage();
+            QString warningsStr = QString(argv[++i]);
+            if (warningsStr == QLatin1String("show")) {
+                warningsConfig = ShowWarnings;
+            } else if (warningsStr == QLatin1String("hide")) {
+                warningsConfig = HideWarnings;
+            } else {
+                usage();
+            }
         } else if (arg == "-I" || arg == "-L") {
             if (arg == "-L")
                 qWarning("-L option provided for compatibility only, use -I instead");
@@ -323,6 +325,8 @@ int main(int argc, char ** argv)
             sizeToView = false;
         } else if (arg == "-sizerootobjecttoview") {
             sizeToView = true;
+        } else if (arg == "-experimentalgestures") {
+            experimentalGestures = true;
         } else if (arg[0] != '-') {
             fileName = arg;
         } else if (1 || arg == "-help") {
@@ -340,13 +344,6 @@ int main(int argc, char ** argv)
     if (stayOnTop)
         wflags |= Qt::WindowStaysOnTopHint;
 
-#if !defined(Q_OS_SYMBIAN)
-    LoggerWidget loggerWidget(0);
-    if (showLogWidget) {
-        logger = &loggerWidget;
-    }
-#endif
-
     QDeclarativeViewer *viewer = new QDeclarativeViewer(0, wflags);
     if (!scriptopts.isEmpty()) {
         QStringList options = 
@@ -389,6 +386,19 @@ int main(int argc, char ** argv)
         usage();
     }
 
+#if !defined(Q_OS_SYMBIAN)
+    logger = viewer->warningsWidget();
+    if (warningsConfig == ShowWarnings) {
+        logger.data()->setDefaultVisibility(LoggerWidget::ShowWarnings);
+        logger.data()->show();
+    } else if (warningsConfig == HideWarnings){
+        logger.data()->setDefaultVisibility(LoggerWidget::HideWarnings);
+    }
+#endif
+
+    if (experimentalGestures)
+        viewer->enableExperimentalGestures();
+
     foreach (QString lib, imports)
         viewer->addLibraryPath(lib);
 
@@ -398,21 +408,10 @@ int main(int argc, char ** argv)
     viewer->setNetworkCacheSize(cache);
     viewer->setRecordFile(recordfile);
     viewer->setSizeToView(sizeToView);
-    if (resizeview)
-        viewer->setScaleView();
     if (fps>0)
         viewer->setRecordRate(fps);
     if (autorecord_to)
         viewer->setAutoRecord(autorecord_from,autorecord_to);
-    if (!skin.isEmpty()) {
-        if (skin == "list") {
-            foreach (QString s, viewer->builtinSkins())
-                qWarning() << qPrintable(s);
-            exit(0);
-        } else {
-            viewer->setSkin(skin);
-        }
-    }
     if (devkeys)
         viewer->setDeviceKeys(true);
     viewer->setRecordDither(dither);