diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-06-04 11:10:57 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-06-10 10:16:58 +0300 |
| commit | 5fd662b550d2fc8f32101ef3a4981e71c01b2f0a (patch) | |
| tree | 5765b3368a35c8ad8030813465caa2f4b76ddcbc /coin/platform_configs/default.txt | |
| parent | 6c6c6ca1a5e1b2f79d3784d713aaa4d0adeaaeac (diff) | |
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 d77fdecc11054c6fb0c34824935fcbfcdf644734)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'coin/platform_configs/default.txt')
| -rw-r--r-- | coin/platform_configs/default.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 92d33c3f..523fdeda 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,18 +2,18 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ qtci-windows-10-x86_64-10 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -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% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -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% -plugin-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% +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging -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% -plugin-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% qtci-windows-10-x86_64-10 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -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% qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qtci-windows-10-x86_64-10 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -verbose -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% +qtci-windows-10-x86_64-10 MSVC2017 Packaging -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% -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% qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -openssl -qtlibinfix TestInfix -qtnamespace TestNamespace qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -openssl -platform linux-icc-64 qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten -qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . +qtci-linux-RHEL-7.4-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -openssl -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang |