diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-06-02 16:40:24 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-06-02 16:40:24 +0300 |
| commit | 3fdbd475202703530ca4b8f7f2a0e731d5f87f8b (patch) | |
| tree | 516a9c48a004fc471fe8bc5dedd4efa72550cab9 /coin | |
| parent | 35f79da9cb99c7c0456f002829dc0fdfe55b4f8d (diff) | |
| parent | 45e77c3a1eb790d89f2ded5b7fbe556ed4b5271c (diff) | |
Merge remote-tracking branch 'origin/4.1'
Change-Id: I86049138466399411ba36791330f4a94faad8c52
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/qmake_module_build.yaml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/coin/instructions/qmake_module_build.yaml b/coin/instructions/qmake_module_build.yaml index 37ff0f396..3e1072d01 100644 --- a/coin/instructions/qmake_module_build.yaml +++ b/coin/instructions/qmake_module_build.yaml @@ -33,9 +33,23 @@ instructions: directory: "{{.BuildDir}}" - type: ExecuteCommand + command: ["{{.InstallDir}}/bin/qmake", "QTPLUGIN.platforms = qminimal qxcb", "INSTALL_PREFIX={{.InstallDir}}", "{{.SourceDir}}"] + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 600 + userMessageOnFailure: "Failed to run qmake, check logs." + enable_if: + condition: property + property: host.os + equals_value: Linux + + - type: ExecuteCommand command: ["{{.InstallDir}}/bin/qmake", "INSTALL_PREFIX={{.InstallDir}}", "{{.SourceDir}}"] maxTimeInSeconds: 1800 maxTimeBetweenOutput: 600 userMessageOnFailure: "Failed to run qmake, check logs." + enable_if: + condition: property + property: host.os + not_equals_value: Linux - !include "{{installer-framework/installer-framework}}/make_instructions.yaml" - !include "{{installer-framework/installer-framework}}/make_documentation.yaml" |