Merge remote-tracking branch 'origin/4.13'

 Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07

11 files changed, 56 insertions, 69 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
index 22b8b0675aa..efbfcd56421 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
@@ -107,10 +107,22 @@ Item {
         if (createEditView()) {
             if (activeScene) {
                 var toolStates = _generalHelper.getToolStates(sceneId);
-                if (Object.keys(toolStates).length > 0)
+                if (Object.keys(toolStates).length > 0) {
                     updateToolStates(toolStates, true);
-                else
+                } else {
+                    // Don't inherit the edit light state from the previous scene, but rather
+                    // turn the edit light on for scenes that do not have any scene
+                    // lights, and turn it off for scenes that have.
+                    var hasSceneLight = false;
+                    for (var i = 0; i < lightIconGizmos.length; ++i) {
+                        if (lightIconGizmos[i].scene === activeScene) {
+                            hasSceneLight = true;
+                            break;
+                        }
+                    }
+                    showEditLight = !hasSceneLight;
                     storeCurrentToolStates();
+                }
             } else {
                 // When active scene is deleted, this function gets called by object deletion
                 // handlers without going through setActiveScene, so make sure sceneId is cleared.
@@ -141,6 +153,14 @@ Item {
             _generalHelper.enableItemUpdate(editView, (scene && scene === activeScene));
     }
 
+    function handleActiveSceneIdChange(newId)
+    {
+        if (sceneId !== newId) {
+            sceneId = newId;
+            storeCurrentToolStates();
+        }
+    }
+
     function fitToView()
     {
         if (editView) {
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 4fe5058adce..2a2c7fce8fa 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -1253,12 +1253,33 @@ void Qt5InformationNodeInstanceServer::changeIds(const ChangeIdsCommand &command
 {
     Qt5NodeInstanceServer::changeIds(command);
 
+#ifdef QUICK3D_MODULE
+    ServerNodeInstance sceneInstance = active3DSceneInstance();
     if (m_active3DSceneUpdatePending) {
-        ServerNodeInstance sceneInstance = active3DSceneInstance();
         const QString sceneId = sceneInstance.id();
         if (!sceneId.isEmpty())
             updateActiveSceneToEditView3D();
+    } else {
+        qint32 sceneInstanceId = sceneInstance.instanceId();
+        const QVector<IdContainer> ids = command.ids();
+        for (const auto &id : ids) {
+            if (sceneInstanceId == id.instanceId()) {
+                QMetaObject::invokeMethod(m_editView3DRootItem, "handleActiveSceneIdChange",
+                                          Qt::QueuedConnection,
+                                          Q_ARG(QVariant, QVariant(sceneInstance.id())));
+                render3DEditView();
+                break;
+            }
+        }
     }
+#endif
+}
+
+void Qt5InformationNodeInstanceServer::changeState(const ChangeStateCommand &command)
+{
+    Qt5NodeInstanceServer::changeState(command);
+
+    render3DEditView();
 }
 
 // update 3D view size when it changes in creator side
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
index 20a1c22da02..40668da55d6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
@@ -62,6 +62,7 @@ public:
     void changeAuxiliaryValues(const ChangeAuxiliaryCommand &command) override;
     void changePropertyBindings(const ChangeBindingsCommand &command) override;
     void changeIds(const ChangeIdsCommand &command) override;
+    void changeState(const ChangeStateCommand &command) override;
 
 private slots:
     void handleSelectionChanged(const QVariant &objs);
diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/file.pro b/share/qtcreator/templates/wizards/projects/consoleapp/file.pro
index a8ed27c2ad1..dafae633029 100644
--- a/share/qtcreator/templates/wizards/projects/consoleapp/file.pro
+++ b/share/qtcreator/templates/wizards/projects/consoleapp/file.pro
@@ -3,15 +3,8 @@ QT -= gui
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
+# You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \\
diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs b/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs
index dfdd823780a..3f06621d453 100644
--- a/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs
+++ b/share/qtcreator/templates/wizards/projects/consoleapp/file.qbs
@@ -4,15 +4,8 @@ QtApplication {
     cpp.cxxLanguageVersion: "c++11"
 
     cpp.defines: [
-        // The following define makes your compiler emit warnings if you use
-        // any Qt feature that has been marked deprecated (the exact warnings
-        // depend on your compiler). Please consult the documentation of the
-        // deprecated API in order to know how to port your code away from it.
-        "QT_DEPRECATED_WARNINGS",
-
-        // You can also make your code fail to compile if it uses deprecated APIs.
+        // You can make your code fail to compile if it uses deprecated APIs.
         // In order to do so, uncomment the following line.
-        // You can also select to disable deprecated APIs only up to a certain version of Qt.
         //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
     ]
 
diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro b/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro
index 8eba894fe5a..7c1be98faa9 100644
--- a/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro
+++ b/share/qtcreator/templates/wizards/projects/cpplibrary/project.pro
@@ -17,15 +17,8 @@ DEFINES += %{LibraryDefine}
 
 CONFIG += c++11
 
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
+# You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \\
diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/project.qbs b/share/qtcreator/templates/wizards/projects/cpplibrary/project.qbs
index 2c51c9e116d..f314f74e477 100644
--- a/share/qtcreator/templates/wizards/projects/cpplibrary/project.qbs
+++ b/share/qtcreator/templates/wizards/projects/cpplibrary/project.qbs
@@ -20,16 +20,9 @@ DynamicLibrary {
         "QT_PLUGIN",
 @endif
 
-        // The following define makes your compiler emit warnings if you use
-        // any Qt feature that has been marked deprecated (the exact warnings
-        // depend on your compiler). Please consult the documentation of the
-        // deprecated API in order to know how to port your code away from it.
-        "QT_DEPRECATED_WARNINGS",
-
-        // You can also make your code fail to compile if it uses deprecated APIs.
+        // You can make your code fail to compile if it uses deprecated APIs.
         // In order to do so, uncomment the following line.
-        // You can also select to disable deprecated APIs only up to a certain version of Qt.
-        // "QT_DISABLE_DEPRECATED_BEFORE=0x060000", // disables all the APIs deprecated before Qt 6.0.0
+        //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
     ]
 
     files: [
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro
index 908aaa3e07a..18767f8623a 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro
@@ -6,15 +6,8 @@ QT += quick
 
 CONFIG += c++11
 
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Refer to the documentation for the
-# deprecated API to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
+# You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \\
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
index b22af44529d..c432214ce2f 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
@@ -13,15 +13,8 @@ CppApplication {
     cpp.cxxLanguageVersion: "c++14"
 
     cpp.defines: [
-        // The following define makes your compiler emit warnings if you use
-        // any Qt feature that has been marked deprecated (the exact warnings
-        // depend on your compiler). Please consult the documentation of the
-        // deprecated API in order to know how to port your code away from it.
-        "QT_DEPRECATED_WARNINGS",
-
-        // You can also make your code fail to compile if it uses deprecated APIs.
+        // You can make your code fail to compile if it uses deprecated APIs.
         // In order to do so, uncomment the following line.
-        // You can also select to disable deprecated APIs only up to a certain version of Qt.
         //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
     ]
 
diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.pro b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.pro
index a0a237bf20e..abf62ced022 100644
--- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.pro
+++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.pro
@@ -4,15 +4,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 CONFIG += c++11
 
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
+# You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \\
diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.qbs b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.qbs
index baa6326cb83..dfba4acf115 100644
--- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.qbs
+++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.qbs
@@ -3,16 +3,10 @@ import qbs.FileInfo
 QtApplication {
     Depends { name: "Qt.widgets" }
 
-    // The following define makes your compiler emit warnings if you use
-    // any Qt feature that has been marked deprecated (the exact warnings
-    // depend on your compiler). Please consult the documentation of the
-    // deprecated API in order to know how to port your code away from it.
-    // You can also make your code fail to compile if it uses deprecated APIs.
-    // In order to do so, uncomment the second entry in the list.
-    // You can also select to disable deprecated APIs only up to a certain version of Qt.
     cpp.defines: [
-        "QT_DEPRECATED_WARNINGS",
-        /* "QT_DISABLE_DEPRECATED_BEFORE=0x060000" */ // disables all the APIs deprecated before Qt 6.0.0
+        // You can make your code fail to compile if it uses deprecated APIs.
+        // In order to do so, uncomment the following line.
+        //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
     ]
 
     files: [