diff options
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 14 | ||||
| -rw-r--r-- | coin/qt-installer-package-config.json | 21 |
2 files changed, 27 insertions, 8 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 741558a5a..f1d69a277 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -4,6 +4,12 @@ accept_configuration: property: features not_contains_value: Disable +machine_type: + Build: + cores: 8 + Test: + cores: 4 + instructions: Build: - type: EnvironmentVariable @@ -12,6 +18,13 @@ instructions: - 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 @@ -22,3 +35,4 @@ instructions: 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 0ba69adac..ac604d77b 100644 --- a/coin/qt-installer-package-config.json +++ b/coin/qt-installer-package-config.json @@ -2,18 +2,23 @@ "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/*", + "**/lib/QtPdf*.framework/**", + "**/metatypes/*pdf*", "**/mkspecs/modules/qt_lib_pdf*", "**/mkspecs/modules/qt_plugin_qpdf.pri", - "**/plugins/imageformats/*", - "**/qml/QtQuick/**/*" + "**/modules/Pdf*", + "**/plugins/imageformats/**/*", + "**/qml/QtQuick/**/*", + "**/qml/QtQuick/Pdf/**/.rcc/*", + "**/qml/QtQuick/Pdf/**/.rcc/qmlcache/*" ] } } |