diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-18 15:10:10 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-11-30 08:45:22 +0000 |
| commit | 2e830e5e4fdafed981bb5d95cd0327d572b7a402 (patch) | |
| tree | b2f8b6ca00b1661e309e52d8e47e8a155fa1fcd8 /share | |
| parent | 6566e0c7a56b0c854514f38f020a04b90042deb8 (diff) | |
Support big Qt resources
[ChangeLog] Introduced the property Qt.core.enableBigResources for the
creation of "big" Qt resources.
Change-Id: Ic87aa70132240e67243c1cbe137583a371558261
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 8 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 12 |
2 files changed, 15 insertions, 5 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 79575ca2b..972555ed7 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -581,9 +581,13 @@ CppModule { auxiliaryInputs: ["hpp"] explicitlyDependsOn: ["c_pch", "cpp_pch", "objc_pch", "objcpp_pch"] - outputFileTags: ["obj", "c_obj", "cpp_obj"] + outputFileTags: ["obj", "c_obj", "cpp_obj", "intermediate_obj"] outputArtifacts: { - var tags = ["obj"]; + var tags; + if (input.fileTags.contains("cpp_intermediate_object")) + tags = ["intermediate_obj"]; + else + tags = ["obj"]; if (inputs.c || inputs.objc) tags.push("c_obj"); if (inputs.cpp || inputs.objcpp) diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index b22984a6e..8dd6dd2c0 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -173,9 +173,15 @@ CppModule { auxiliaryInputs: ["hpp"] explicitlyDependsOn: ["c_pch", "cpp_pch"] - Artifact { - fileTags: ['obj'] - filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + ".obj" + outputFileTags: ["obj", "intermediate_obj"] + outputArtifacts: { + var tags = input.fileTags.contains("cpp_intermediate_object") + ? ["intermediate_obj"] + : ["obj"]; + return [{ + fileTags: tags, + filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + ".obj" + }]; } prepare: { |