Merge remote-tracking branch 'origin/2.7'

Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3

3 files changed, 47 insertions, 0 deletions

diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs
index 0f096b8477..1b46304147 100644
--- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs
+++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs
@@ -31,6 +31,7 @@
 function Component()
 {
     component.loaded.connect(this, Component.prototype.loaded);
+    installer.installationFinished.connect(this, Component.prototype.installationFinishedPageIsShown);
     installer.finishButtonClicked.connect(this, Component.prototype.installationFinished);
     installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
 }
@@ -173,6 +174,17 @@ Component.prototype.createOperations = function()
     }
 }
 
+Component.prototype.installationFinishedPageIsShown = function()
+{
+    try {
+        if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success) {
+            installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished );
+        }
+    } catch(e) {
+        print(e);
+    }
+}
+
 Component.prototype.installationFinished = function()
 {
     try {
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui
new file mode 100644
index 0000000000..4d6060c67a
--- /dev/null
+++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LaunchQtCreatorCheckBoxForm</class>
+ <widget class="QWidget" name="LaunchQtCreatorCheckBoxForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>112</width>
+    <height>17</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QCheckBox" name="launchQtCreatorCheckBox">
+     <property name="text">
+      <string>Launch Qt Creator</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <property name="tristate">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in
index 0e21746d4e..e9d378cd70 100644
--- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in
+++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in
@@ -14,5 +14,6 @@
     <AutoDependOn>org.qtproject.qtcreator</AutoDependOn>
     <UserInterfaces>
         <UserInterface>associatecommonfiletypesform.ui</UserInterface>
+        <UserInterface>launchqtcreatorcheckboxform.ui</UserInterface>
     </UserInterfaces>
 </Package>