diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-02 11:29:41 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-02 11:29:41 +0200 |
| commit | 11a08386295c1b9c9abb71899421274daea07d2c (patch) | |
| tree | 5466f742b67982b92a697b9618eaaa083b4a5649 /qbs-resources | |
| parent | 3c6c36bc36cfd3763d8b4a6184d130b5bd731a08 (diff) | |
| parent | 7e67993ea78570cd44aaec6595219cf68bd21cf0 (diff) | |
Merge 1.8 into master
Change-Id: I79817dea8855d7327d3b8d53f30f29ecebd5daaf
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index 24b655398..0e93f81b4 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -9,7 +9,8 @@ Module { property string appInstallDir: "bin" property string libInstallDir: qbs.targetOS.contains("windows") ? "bin" : libDirName property string importLibInstallDir: libDirName - property string libexecInstallDir: "libexec/qbs" + property string libexecInstallDir: qbs.targetOS.contains("windows") ? appInstallDir + : "libexec/qbs" property bool installHtml: true property bool installQch: false property string docInstallDir: "share/doc/qbs/html" |