summaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/qt5.yaml
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2020-04-30 17:24:22 +0200
committerLiang Qi <liang.qi@qt.io>2020-04-30 18:35:08 +0200
commit54c94ae681e3a2689468ce810884e5f5611b97f0 (patch)
tree1f4e4223357b1a1d05b8e72beb99393dfbff9920 /coin/platform_configs/qt5.yaml
parentff4a1141f26e66934d043d65881f1cf2aaecc788 (diff)
parent5f03b84e6542f00cf9eccd1d8820f423cee5e2b9 (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/qt5.yaml')
-rw-r--r--coin/platform_configs/qt5.yaml17
1 files changed, 11 insertions, 6 deletions
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index c48b63ab..30ac3e67 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,21 +1,26 @@
+Version: 2
+Configurations:
-
Template: 'qtci-windows-7-x86-3'
- Compiler: 'Mingw73'
+ Compiler: 'Mingw'
+ Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -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 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
- Compiler: 'Mingw73'
+ Template: 'qtci-windows-10-x86_64-17'
+ Compiler: 'Mingw'
+ Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -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 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'Android_ANY'
Target arch: 'multi'
- Compiler: 'Mingw73'
+ Compiler: 'Mingw'
+ Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Target compiler: 'Clang'
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
- Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -qt-zlib'
+ Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'Android_ANY'