diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
| commit | cc4fdea014287bb2c2b7dfe55104c2d620026da5 (patch) | |
| tree | fd04d83477596ad43e514cd3f8f1cfbb477d0aea /coin/platform_configs/qtwebkit.yaml | |
| parent | 285f2c5690290e49313ccf8b76402c30acabbb5e (diff) | |
| parent | ac8b28db576356431a1a414b2c08b2eb09c8b898 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.gitmodules
coin/platform_configs/qt5.yaml
coin/platform_configs/qtsdk.yaml
coin/platform_configs/tqtc-qt-rta.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
Diffstat (limited to 'coin/platform_configs/qtwebkit.yaml')
| -rw-r--r-- | coin/platform_configs/qtwebkit.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 5661bd92..900793c2 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -5,4 +5,9 @@ Configurations: Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] 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' |