diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2021-04-29 06:48:01 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2021-05-03 10:20:19 +0000 |
| commit | d54c162f1f4dff54be930ce2f7370dd540a1e1bf (patch) | |
| tree | 2954160b952e879d2820a66e18b0f147cea5b6c8 | |
| parent | b811d0799517680895c3ca70d7593fdd5e97f44f (diff) | |
Remove wayland dependency from Linux binaries
Wayland dependency is added to installer binaries if it is found from
system at build time. Added explicit dependencies only to xcb and
minimal platform plugins.
Task-number: QTIFW-2067
Change-Id: I0b65ef10824122c7041f1aa566d7a989aa085503
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| -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" |