Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08

1 files changed, 28 insertions, 0 deletions

diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml
new file mode 100644
index 00000000..da37d0e5
--- /dev/null
+++ b/coin/platform_configs/tqtc-qt-config-gui.yaml
@@ -0,0 +1,28 @@
+Version: 2
+Module only: True
+Configurations:
+    -
+        Template: 'qtci-windows-10-x86_64-14'
+        Compiler: 'MSVC2017'
+        Features: ['Packaging']
+        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -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% -static -no-icu'
+    -
+        Template: 'qtci-windows-10-x86_64-14'
+        Compiler: 'MSVC2017'
+        Target arch: 'x86'
+        Features: ['Packaging']
+        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -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% -static -no-icu'
+    -
+        Template: 'qtci-linux-RHEL-7.6-x86_64'
+        Compiler: 'GCC'
+        Features: ['Packaging']
+        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']