Merge remote-tracking branch 'origin/11.0' into qds/dev

Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e

src/tools/disclaim/disclaim.qbs

@@ -3,6 +3,7 @@ import qbs 1.0
 QtcTool {
     name: "disclaim"
     condition: qbs.targetOS.contains("macos")
+    useQt: false
 
     files: [
         "disclaim.mm"

src/tools/icons/qtcreatoricons.svg

@@ -3604,6 +3604,42 @@
          id="use3673"
          transform="matrix(-1,0,0,1,2258,0)" />
     </g>
+    <g
+       id="src/plugins/terminal/images/keyboardlock"
+       transform="translate(845,88.5)"
+       style="display:inline">
+      <use
+         style="display:inline"
+         transform="translate(1137,43.5)"
+         height="100%"
+         width="100%"
+         id="use1952-7"
+         xlink:href="#backgroundRect"
+         y="0"
+         x="0" />
+      <rect
+         style="fill:none;stroke:#000000"
+         id="rect11662"
+         width="13"
+         height="13"
+         x="1122.5"
+         y="481"
+         rx="2.5" />
+      <rect
+         style="fill:none;stroke:#000000"
+         id="rect11664"
+         width="9"
+         height="8"
+         x="1124.5"
+         y="483"
+         rx="1.3" />
+      <path
+         style="fill:none;stroke:#000000"
+         d="m 1131,485 h -2 c -0.5,0 -1.5,0 -1.5,1 0,1 1,1 1.5,1 0.5,0 1.5,0 1.5,1 0,1 -1,1 -1.5,1 h -2"
+         id="path5086-3"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczczcc" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"

src/tools/process_stub/main.cpp

@@ -542,6 +542,8 @@ void onControlSocketReadyRead()
             break;
         }
         }
+
+        sendMsg(QString("ack %1\n").arg(ch).toUtf8());
     }
 }
 

src/tools/process_stub/process_stub.qbs

@@ -4,7 +4,7 @@ QtcTool {
     name: "qtcreator_process_stub"
     consoleApplication: true
 
-    Depends { name: "Qt"; submodules: ["core", "network"]; }
+    Depends { name: "Qt.network" }
 
-    files: [ "main.cpp" ]
+    files: "main.cpp"
 }

src/tools/qtpromaker/qtpromaker.qbs

@@ -3,7 +3,5 @@ import qbs 1.0
 QtcTool {
     name: "qtpromaker"
 
-    Depends { name: "Qt.core" }
-
-    files: [ "main.cpp" ]
+    files: "main.cpp"
 }