Skip to content

Commit

Permalink
Fix Qt Creator executable installation for qbs.
Browse files Browse the repository at this point in the history
Commit 59ac67c broke this for non-OS X.

Change-Id: Iac23a3e37bd9964af4ffb79be256f59c0b0fedb9
Reviewed-by: Jake Petroules <[email protected]>
  • Loading branch information
Christian Kandeler committed Dec 7, 2015
1 parent be5b1ab commit f97e5f1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 0 additions & 2 deletions qbs/imports/QtcProduct.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import QtcFunctions

Product {
property string installDir
property string installSourceBase

Depends { name: "cpp" }
cpp.defines: project.generalDefines
Expand All @@ -24,6 +23,5 @@ Product {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: installDir
qbs.installSourceBase: installSourceBase
}
}
12 changes: 8 additions & 4 deletions src/app/app.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,24 @@ 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 {
condition: qbs.targetOS.contains("osx")
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"]
Expand Down Expand Up @@ -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
}
}

0 comments on commit f97e5f1

Please sign in to comment.