diff options
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 38 | ||||
| -rw-r--r-- | coin/qt-installer-package-config.json | 23 |
2 files changed, 54 insertions, 7 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 000000000..f1d69a277 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,38 @@ +version: 2 +accept_configuration: + condition: property + property: features + not_contains_value: Disable + +machine_type: + Build: + cores: 8 + Test: + cores: 4 + +instructions: + Build: + - type: EnvironmentVariable + variableName: CMAKE_BUILD_TIMEOUT + variableValue: "36000" + - type: EnvironmentVariable + variableName: CMAKE_BUILD_OUTPUT_TIMEOUT + variableValue: "3600" + - type: EnvironmentVariable + variableName: QTWEBENGINE_GN_THREADS + variableValue: "1" + enable_if: + condition: property + property: host.os + equals_value: MacOS + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + Test: + - type: EnvironmentVariable + variableName: QTWEBENGINE_DISABLE_SANDBOX + variableValue: "1" + enable_if: + condition: property + property: target.osVersion + equals_value: QEMU + - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" + - !include "{{qt/qtbase}}/coin_module_test_docs.yaml" diff --git a/coin/qt-installer-package-config.json b/coin/qt-installer-package-config.json index 8507c9ec9..aec45688b 100644 --- a/coin/qt-installer-package-config.json +++ b/coin/qt-installer-package-config.json @@ -2,16 +2,25 @@ "version": "1", "module-split": { "qtpdf": [ + "**/bin/*Pdf*", "**/include/*QtPdf*/**/*", - "**/lib/cmake/Qt5Gui/*", - "**/lib/cmake/Qt5Pdf/*", - "**/lib/cmake/Qt5PdfWidgets/*", - "**/lib/pkgconfig/Qt5Pdf*", - "**/lib/libQt5Pdf*", + "**/lib/cmake/Qt*Gui/*Pdf*", + "**/lib/cmake/Qt*Pdf*/*", + "**/lib/cmake/Qt*Qml/QmlPlugins/*Pdf*", + "**/lib/pkgconfig/*Pdf*", + "**/lib/*Pdf*", "**/lib/static_chrome/*", + "**/lib/QtPdf*.framework/**", + "**/metatypes/*pdf*", "**/mkspecs/modules/qt_lib_pdf*", - "**/plugins/imageformats/*", - "**/qml/QtQuick/**/*" + "**/mkspecs/modules/qt_plugin_qpdf.pri", + "**/modules/Pdf*", + "**/plugins/imageformats/**/*", + "**/qml/QtQuick/**/*", + "**/qml/QtQuick/Pdf/**/.rcc/*", + "**/qml/QtQuick/Pdf/**/.rcc/qmlcache/*", + "**/qml/QtQuick/Pdf/**/.qt/rcc/*", + "**/qml/QtQuick/Pdf/**/.qt/rcc/qmlcache/*" ] } } |