diff options
author | Liang Qi <liang.qi@qt.io> | 2020-04-30 17:24:22 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-04-30 18:35:08 +0200 |
commit | 54c94ae681e3a2689468ce810884e5f5611b97f0 (patch) | |
tree | 1f4e4223357b1a1d05b8e72beb99393dfbff9920 /coin/platform_configs/qdb.yaml | |
parent | ff4a1141f26e66934d043d65881f1cf2aaecc788 (diff) | |
parent | 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtwebkit.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
Diffstat (limited to 'coin/platform_configs/qdb.yaml')
-rw-r--r-- | coin/platform_configs/qdb.yaml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index e42780b7..eea309b4 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2015' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' @@ -18,6 +18,11 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - + Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' + - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] |