From f97e5f15455205f5e161f549e87ba83f5a6dd05e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Wed, 2 Dec 2015 17:26:23 +0100
Subject: [PATCH] Fix Qt Creator executable installation for qbs.

Commit 59ac67c0bb broke this for non-OS X.

Change-Id: Iac23a3e37bd9964af4ffb79be256f59c0b0fedb9
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
---
 qbs/imports/QtcProduct.qbs |  2 --
 src/app/app.qbs            | 12 ++++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index 10e9fa09377..d38b7b0ecbb 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -3,7 +3,6 @@ import QtcFunctions
 
 Product {
     property string installDir
-    property string installSourceBase
 
     Depends { name: "cpp" }
     cpp.defines: project.generalDefines
@@ -24,6 +23,5 @@ Product {
         fileTagsFilter: product.type
         qbs.install: true
         qbs.installDir: installDir
-        qbs.installSourceBase: installSourceBase
     }
 }
diff --git a/src/app/app.qbs b/src/app/app.qbs
index 07c658d0a77..fb677f22785 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -4,7 +4,6 @@ QtcProduct {
     Depends { name: "bundle" }
     Depends { name: "ib"; condition: qbs.targetOS.contains("osx") }
 
-    bundle.isBundle: true
     bundle.infoPlistFile: "Info.plist" // TODO: Remove for qbs 1.6
 
     Properties {
@@ -12,12 +11,17 @@ QtcProduct {
         ib.appIconName: "qtcreator"
     }
 
+    Properties {
+        condition: qbs.targetOS.contains("windows")
+        consoleApplication: qbs.debugInformation
+    }
+    consoleApplication: false
+
     type: ["application"]
     name: project.ide_app_target
-    consoleApplication: qbs.debugInformation
     version: project.qtcreator_version
 
-    installSourceBase: buildDirectory
+    installDir: project.ide_bin_path
 
     cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../Frameworks"]
                                              : ["$ORIGIN/../" + project.libDirName + "/qtcreator"]
@@ -73,6 +77,6 @@ QtcProduct {
         condition: qbs.targetOS.contains("osx")
         fileTagsFilter: ["infoplist", "pkginfo", "compiled_assetcatalog"]
         qbs.install: true
-        qbs.installSourceBase: installSourceBase
+        qbs.installSourceBase: product.buildDirectory
     }
 }