diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:15:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:24:54 +0200 |
| commit | 5ef4ad5e90e86731542a5620dc500ec4da40c9d6 (patch) | |
| tree | ee798e10633f87253b389410f2b5343582d29702 /coin/platform_configs/qtwebengine.yaml | |
| parent | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (diff) | |
| parent | df53ff5f85f69932538cc1c571b86b0c2a885a10 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmakewip/cmake
Bringing in new SHA1s, and updated cmake-specific configurations.
Intended for Qt6 Installer essentials package creation.
Conflicts
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: I6abc2d952ae75785e34b70977e41018a72acf5bc
Diffstat (limited to 'coin/platform_configs/qtwebengine.yaml')
| -rw-r--r-- | coin/platform_configs/qtwebengine.yaml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index c5809149..906e0236 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -17,11 +17,6 @@ Configurations: Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-SLES-15-x86_64' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] |