aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2020-02-29 03:13:17 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2020-03-05 04:12:11 +0300
commit7ba8c15d79be619c4cef8c0aa76fe9472b3ad7da (patch)
treec7fde62977c596b405eaafd3a4052ecba390f8d6
parentb7b6e31d47cda92e6f4e58ba69540b6b8c4a1341 (diff)
Update platform_configs for QtWebKit
* Add 64-bit MinGW config * Don't use DisableTests for 64-bit MinGW, as it's necessary for at least for the purpose of JS engine smoke check * Sync configure flags with qt5.yaml, but not enable forced debug info which causes build issues for both 32-bit and 64-bit configs Change-Id: Iad5ff1459f8b39f17223da75b3319ab0cfc033d8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rw-r--r--coin/platform_configs/qtwebkit.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml
index 0a1d5d31..29291d53 100644
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -2,4 +2,9 @@
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
+-
+ Template: 'qtci-windows-10-x86_64-16'
+ Compiler: 'Mingw73'
+ Features: ['Packaging']
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'