Merge remote-tracking branch 'origin/2.6'

Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e

1 files changed, 134 insertions, 28 deletions

diff --git a/share/share.qbs b/share/share.qbs
index 4e81ff2d52..358301450b 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -5,6 +5,13 @@ Product {
     name: "SharedContent"
 
     Group {
+        condition: qbs.targetOS == "macx"
+        qbs.installDir: "share/qtcreator/scripts"
+        fileTags: ["install"]
+        files: "qtcreator/scripts/openTerminal.command"
+    }
+
+    Group {
         qbs.installDir: "share/qtcreator/designer"
         fileTags: ["install"]
         prefix: "qtcreator/designer/"
@@ -124,7 +131,6 @@ Product {
         fileTags: ["install"]
         prefix: "qtcreator/qml/qmldump/"
         files: [
-            "Info.plist.in",
             "LGPL_EXCEPTION.TXT",
             "LICENSE.LGPL",
             "main.cpp",
@@ -219,13 +225,13 @@ Product {
         fileTags: ["install"]
         prefix: "qtcreator/qml/qmlobserver/"
         files: [
-            "Info.plist.in",
             "LGPL_EXCEPTION.TXT",
             "LICENSE.LGPL",
             "deviceorientation.cpp",
             "deviceorientation.h",
             "deviceorientation_harmattan.cpp",
             "deviceorientation_maemo5.cpp",
+            "deviceorientation_symbian.cpp",
             "loggerwidget.cpp",
             "loggerwidget.h",
             "main.cpp",
@@ -454,7 +460,6 @@ Product {
         fileTags: ["install"]
         prefix: "qtcreator/qml/qmlpuppet/qml2puppet/"
         files: [
-            "Info.plist.in",
             "main.cpp",
             "qml2puppet.pro",
         ]
@@ -486,7 +491,6 @@ Product {
         fileTags: ["install"]
         prefix: "qtcreator/qml/qmlpuppet/qmlpuppet/"
         files: [
-            "Info.plist.in",
             "main.cpp",
             "qmlpuppet.pri",
             "qmlpuppet.pro",
@@ -757,15 +761,6 @@ Product {
     }
 
     Group {
-        qbs.installDir: "share/qtcreator/scripts"
-        fileTags: ["install"]
-        prefix: "qtcreator/scripts/"
-        files: [
-            "openTerminal.command",
-        ]
-    }
-
-    Group {
         qbs.installDir: "share/qtcreator/snippets"
         fileTags: ["install"]
         prefix: "qtcreator/snippets/"
@@ -888,6 +883,36 @@ Product {
     }
 
     Group {
+        qbs.installDir: "share/qtcreator/templates/qtquick2app"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/qtquick2app/"
+        files: [
+            "app.pro",
+            "main.cpp",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/qtquick2app/qml/app/qtquick20"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/qtquick2app/qml/app/qtquick20/"
+        files: [
+            "main.qml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/qtquick2app/qtquick2applicationviewer"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/qtquick2app/qtquick2applicationviewer/"
+        files: [
+            "qtquick2applicationviewer.cpp",
+            "qtquick2applicationviewer.h",
+            "qtquick2applicationviewer.pri",
+        ]
+    }
+
+    Group {
         qbs.installDir: "share/qtcreator/templates/qtquickapp"
         fileTags: ["install"]
         prefix: "qtcreator/templates/qtquickapp/"
@@ -950,6 +975,102 @@ Product {
     }
 
     Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-bardescriptor"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-bardescriptor/"
+        files: [
+            "bar-descriptor.xml",
+            "wizard.xml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-guiapp"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-guiapp/"
+        files: [
+            "bar-descriptor.xml",
+            "icon.png",
+            "main.cpp",
+            "mainwidget.cpp",
+            "mainwidget.h",
+            "mainwidget.ui",
+            "project.pro",
+            "wizard.xml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-bardescriptor"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-qt5-bardescriptor/"
+        files: [
+            "bar-descriptor.xml",
+            "wizard.xml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-guiapp"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-qt5-guiapp/"
+        files: [
+            "bar-descriptor.xml",
+            "icon.png",
+            "main.cpp",
+            "mainwidget.cpp",
+            "mainwidget.h",
+            "mainwidget.ui",
+            "project.pro",
+            "wizard.xml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-quick2app"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-qt5-quick2app/"
+        files: [
+            "bar-descriptor.xml",
+            "icon.png",
+            "main.cpp",
+            "project.pro",
+            "wizard.xml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-quick2app/qml"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-qt5-quick2app/qml/"
+        files: [
+            "main.qml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-quickapp"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-quickapp/"
+        files: [
+            "bar-descriptor.xml",
+            "icon.png",
+            "main.cpp",
+            "project.pro",
+            "wizard.xml",
+        ]
+    }
+
+    Group {
+        qbs.installDir: "share/qtcreator/templates/wizards/bb-quickapp/qml"
+        fileTags: ["install"]
+        prefix: "qtcreator/templates/wizards/bb-quickapp/qml/"
+        files: [
+            "main.qml",
+        ]
+    }
+
+    Group {
         qbs.installDir: "share/qtcreator/templates/wizards/helloworld"
         fileTags: ["install"]
         prefix: "qtcreator/templates/wizards/helloworld/"
@@ -1063,21 +1184,6 @@ Product {
     }
 
     Group {
-        qbs.installDir: "share/qtcreator/translations"
-        fileTags: ["install"]
-        prefix: "qtcreator/translations/"
-        files: [
-            "README",
-            "check-ts.pl",
-            "check-ts.xq",
-            "extract-customwizards.xq",
-            "extract-externaltools.xq",
-            "extract-mimetypes.xq",
-            "translations.pro",
-        ]
-    }
-
-    Group {
         qbs.installDir: "share/qtcreator/welcomescreen"
         fileTags: ["install"]
         prefix: "qtcreator/welcomescreen/"