diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-11 12:36:24 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-11 12:36:55 +0200 |
| commit | 4ba79af3bb8ba4bc21fc857b5f8863f099c88fee (patch) | |
| tree | 86ca07ef43e5cee1f5a013f49d244861dbdc1484 /share | |
| parent | 4c5f973ffb3e1cc30d4227df79ec8a69995c6996 (diff) | |
| parent | 520fe8cc897a91a466f97f510db7b0c2343a83f9 (diff) | |
Merge remote-tracking branch 'origin/1.9' into master
Change-Id: Ib18e50ecdc9be5f9deaebf68414c2082ddafcc8b
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/dmg/DMGModule.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/dmg/dmg.js | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/share/qbs/modules/dmg/DMGModule.qbs b/share/qbs/modules/dmg/DMGModule.qbs index b45f9d548..09e31f696 100644 --- a/share/qbs/modules/dmg/DMGModule.qbs +++ b/share/qbs/modules/dmg/DMGModule.qbs @@ -76,9 +76,6 @@ Module { readonly property string pythonPath: File.canonicalFilePath(FileInfo.joinPaths(path, "..", "..", "python")) - readonly property string libexecPath: File.canonicalFilePath(FileInfo.joinPaths(path, - "..", "..", "..", "..", - "libexec", "qbs")) property string backgroundColor property int iconSize: 128 diff --git a/share/qbs/modules/dmg/dmg.js b/share/qbs/modules/dmg/dmg.js index 82b701434..4d972db9b 100644 --- a/share/qbs/modules/dmg/dmg.js +++ b/share/qbs/modules/dmg/dmg.js @@ -199,7 +199,7 @@ function prepareDmg(project, product, inputs, outputs, input, output) { cmds.push(cmd); // Create the actual DMG via dmgbuild - cmd = new Command(FileInfo.joinPaths(product.dmg.libexecPath, "dmgbuild"), + cmd = new Command(FileInfo.joinPaths(product.qbs.libexecPath, "dmgbuild"), [product.dmg.volumeName, output.filePath, "--no-hidpi", // qbs handles this by itself |