diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-03 17:00:51 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-09 12:33:10 +0000 |
| commit | afe5f9701d69e7cdb59a80bd8282d469a74b90ec (patch) | |
| tree | 6d3a1a7ccdd510c588b8bf340ce33faeca9ed7a6 /qbs-resources | |
| parent | 15751999bbfa66015f48bbdde2fea2d4e8fed61a (diff) | |
qbs build: Add convenience properties for building statically
So that we can easily test this functionality in the absence of a
statically built Qt.
Change-Id: I9c8f296222bc3155cb95219d4ababfd34e1e7e7b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 5 | ||||
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index 736025cbb..f8bc70580 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -16,11 +16,12 @@ QbsProduct { cpp.soVersion: version.replace(/\.\d+$/, '') } cpp.visibility: "minimal" - property string visibilityType: Qt.core.staticBuild ? "static" : "dynamic" + property string visibilityType: staticBuild ? "static" : "dynamic" property string headerInstallPrefix: "/include/qbs" property bool hasExporter: Utilities.versionCompare(qbs.version, "1.12") >= 0 property bool generateQbsModule: install && qbsbuildconfig.generateQbsModules && hasExporter - property stringList libType: [Qt.core.staticBuild ? "staticlibrary" : "dynamiclibrary"] + property bool staticBuild: Qt.core.staticBuild || qbsbuildconfig.staticBuild + property stringList libType: [staticBuild ? "staticlibrary" : "dynamiclibrary"] Depends { name: "Exporter.qbs"; condition: generateQbsModule } Group { fileTagsFilter: libType.concat("dynamiclibrary_symlink") diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index 8bd3c617a..7f978d47b 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -8,6 +8,7 @@ Module { property bool installApiHeaders: true property bool enableBundledQt: true property bool useBundledQtScript: false + property bool staticBuild: false property string libDirName: "lib" property string appInstallDir: "bin" property string libInstallDir: qbs.targetOS.contains("windows") ? "bin" : libDirName |