Fix platform configuration files

Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 
 
(cherry picked from commit d77fdecc11)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Tony Sarajärvi
2019-06-04 11:10:57 +03:00
parent 6c6c6ca1a5
commit 5fd662b550
3 changed files with 10 additions and 6 deletions

View File

@@ -1,5 +1,5 @@
Template Target OS Target arch Compiler Features Configure arguments
----------------------------------- ------------------- ----------- ----------- ------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++
qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -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% -platform win32-g++
qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static
qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -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% -platform win32-g++
qtci-linux-RHEL-7.4-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker