Commit f97e5f15 authored by Christian Kandeler's avatar Christian Kandeler

Fix Qt Creator executable installation for qbs.

Commit 59ac67c0 broke this for non-OS X.

Change-Id: Iac23a3e37bd9964af4ffb79be256f59c0b0fedb9
Reviewed-by: default avatarJake Petroules <jake.petroules@theqtcompany.com>
parent be5b1ab2
......@@ -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
}
}
......@@ -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
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment