From 33848236660a376315c91900d852670832d74a21 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 May 2020 11:38:50 +0200 Subject: Revert "Temporarily ignore qtnetworkauth" The qtnetworkauth test was fixed, so we can re-enable the module. Bump the sha1 to the latest version of qtnetworkauth. This reverts commit a8d3591327c3f5d3c1e349e752b2c43f7037fca9. Task-number: QTBUG-84071 Change-Id: I68c953fa97cf0f28a391b496fb321aefe9d8e7d6 Reviewed-by: Liang Qi --- .gitmodules | 2 +- qtnetworkauth | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 637bd457..6da4e828 100644 --- a/.gitmodules +++ b/.gitmodules @@ -284,7 +284,7 @@ path = qtnetworkauth url = ../qtnetworkauth.git branch = dev - status = ignore + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative diff --git a/qtnetworkauth b/qtnetworkauth index 20a90737..22fd06a3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 20a907375e08e44e114ccd9daec37be466a1c8f2 +Subproject commit 22fd06a3cb2e96db0afb9666016280b1feb7c8b7 -- cgit v1.2.3 From 688187773b51ec08c5b3c879039440590db85bf9 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 13 May 2020 15:29:50 +0200 Subject: Explicitly enable -headersclean on some configs This is in preparation to turning this off by default in configure, as it increases build times significantly. Change-Id: I2d601595ce8c093765194f36ec5235f79dd4dd7d Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 8e5fb009..7b4183f5 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -10,7 +10,7 @@ Configurations: Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' Features: ['Packaging', 'UseLegacyInstructions'] - 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% -qt-zlib' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -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% -qt-zlib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' @@ -36,12 +36,12 @@ Configurations: Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' 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 -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests', 'Packaging', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -headersclean -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' -- cgit v1.2.3 From 71a559e748064ec262c609d298de102383f8de72 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 May 2020 19:29:38 +0200 Subject: CMake: Enable CMake builds for qtdoc Change-Id: Idca63aef8951a4a104b816e4aac710225d1279c2 Reviewed-by: Paul Wicking Reviewed-by: Joerg Bornemann --- coin/platform_configs/qtdoc.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 coin/platform_configs/qtdoc.yaml diff --git a/coin/platform_configs/qtdoc.yaml b/coin/platform_configs/qtdoc.yaml new file mode 100644 index 00000000..e0dd1697 --- /dev/null +++ b/coin/platform_configs/qtdoc.yaml @@ -0,0 +1,38 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.1-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] -- cgit v1.2.3 From 434e2712aa9582ac59e8c818993e39df3e4e10f2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 20 May 2020 11:54:40 +0200 Subject: Update submodules on 'dev' in qt/qt5 Change-Id: Idd8c485848379879aa3d870ddf9740eab2fb95d3 Reviewed-by: Liang Qi --- qt5compat | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebsockets | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt5compat b/qt5compat index bbbbbf2c..1b89298d 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit bbbbbf2c11097ec0bdf0f17d78ad594651ad3860 +Subproject commit 1b89298d25a4c575226bedaf7e1f2f49b1babc79 diff --git a/qtandroidextras b/qtandroidextras index 71ebb8db..a41d6999 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 71ebb8db74baa9d9d659be5e367b38dce80e8a9a +Subproject commit a41d6999eaca5513363232f039f843bef9de4736 diff --git a/qtbase b/qtbase index 4ba25a09..794150e5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4ba25a092065a6422510a9f4afa4fbbabeda686c +Subproject commit 794150e5bda0c203a5373c3fa2f9785f9941f6dd diff --git a/qtdeclarative b/qtdeclarative index 1465ca26..24abd0d1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1465ca26c62605634afdf7b2c9e8ecbfc2397dae +Subproject commit 24abd0d14ebd420c275fa4e49ddb1a43b441c74f diff --git a/qtdoc b/qtdoc index 758a1c15..4128b500 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 758a1c15ca2b9034ea51fa808763b2eb3b0b61ac +Subproject commit 4128b5005ce01ff6948775f5476ee759677bde47 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 74c81763..fb53552f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 74c81763391f1292482d46d87ea76f39c9064ee3 +Subproject commit fb53552f5e97b54442e7e83020972a13e3329029 diff --git a/qtimageformats b/qtimageformats index c1f396c7..c75f5c0a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c1f396c7cfe848604ef7c738111e33db7829ed6f +Subproject commit c75f5c0acfff3435b38a2ee96eabacf0c3feae94 diff --git a/qtnetworkauth b/qtnetworkauth index 22fd06a3..8ad171f5 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 22fd06a3cb2e96db0afb9666016280b1feb7c8b7 +Subproject commit 8ad171f5074ee65b7017402110ef35107f9a7220 diff --git a/qtqa b/qtqa index a03bac72..c1917763 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 +Subproject commit c1917763a500cf9606a5b638410c62824ec06fb9 diff --git a/qtquick3d b/qtquick3d index 00582106..f0bea578 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 00582106a2d286bf9df52a1d795d176833791e83 +Subproject commit f0bea57820951435e44b1e1aa113617bdcc59622 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 885d0659..4e1e01c4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 885d065902422f82d474e6a8cae43e1b3e4d94d0 +Subproject commit 4e1e01c4e484337586a7419e28c3625055f88038 diff --git a/qtquicktimeline b/qtquicktimeline index ec6bf0d7..a488cb1c 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ec6bf0d7edeb93ddcc10c18ae479135eb700de0a +Subproject commit a488cb1cc0d53059583407f7db52ae7fd8975d0c diff --git a/qtrepotools b/qtrepotools index 8f06a503..c7cccea4 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 +Subproject commit c7cccea498425db98ad276d5b43ddb1148f88921 diff --git a/qtshadertools b/qtshadertools index 7305d0c8..d8aa3fb5 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7305d0c82df5af38e4a4f26731391b923e281d38 +Subproject commit d8aa3fb504723a2ebf54d0eae5c5e6b633826b3a diff --git a/qtsvg b/qtsvg index f759ab49..f8f067f1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f759ab4905879c19ae094d702d5e66ab3ef06479 +Subproject commit f8f067f1d8fd9b07039f91df1c784ee25f71ef2b diff --git a/qttools b/qttools index e633ec59..2495c48a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e633ec59893e2f4a25330be8a9ece4a943cfcef9 +Subproject commit 2495c48a93fe0771ee59777a47071d19062d9e4a diff --git a/qttranslations b/qttranslations index 306dea76..e30abf5b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 306dea7670920719b54350066758da8320743ebe +Subproject commit e30abf5b4bc6bac19c78610ca80defc4daa629f5 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 861d03cd..18a30053 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 861d03cd8f419a8cfae5c6d799863f7a625d9bb2 +Subproject commit 18a30053f3edcb1f65f6a174129299ecae9c5213 diff --git a/qtwayland b/qtwayland index 5d25a0c2..dcd0aa6b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5d25a0c233b1e47cf53d05e90fc7156f8c65d170 +Subproject commit dcd0aa6b31623ee6e2ef50a3c5aaef7054f8d6a9 diff --git a/qtwebsockets b/qtwebsockets index d6790a43..9486a805 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d6790a4330256fbef578274fe3e5b0547b55c9d0 +Subproject commit 9486a8053edd0eab68a03178effebda0d5194607 -- cgit v1.2.3 From afc08c23ca38e9e25633a55592ccc172430a693f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 14 May 2020 11:44:24 +0200 Subject: CMake: Enable CMake builds for qttranslations Fixes: QTBUG-82969 Change-Id: I17e7df82f578338d6c1e3dbc41677d4302d9689b Reviewed-by: Joerg Bornemann --- coin/platform_configs/qttranslations.yaml | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 coin/platform_configs/qttranslations.yaml diff --git a/coin/platform_configs/qttranslations.yaml b/coin/platform_configs/qttranslations.yaml new file mode 100644 index 00000000..e0dd1697 --- /dev/null +++ b/coin/platform_configs/qttranslations.yaml @@ -0,0 +1,38 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.1-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] -- cgit v1.2.3 From fa58a227cd14d301d7d10b6dce85eace953fa211 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 22 May 2020 09:35:58 +0300 Subject: Provisioning: Change resolution for Windows 10 x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we have wrong resolution (1024x768) for 64-bit Windows. Correct one is 1280x800 Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f Reviewed-by: Tony Sarajärvi --- .../01-change-resolution.ps1 | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 new file mode 100644 index 00000000..679769a8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 @@ -0,0 +1,25 @@ +$x_value = "1280" +$y_value = "800" + +Function ChangeResolution { + Param ( + [string]$driver + ) + + $path = "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration" + + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.bottom /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.right /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cx /T REG_dWORD /D $x_value /F + +} + +Write-Host "Changing the resolution to ${x_value}x${y_value}" +ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" +ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" +ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" -- cgit v1.2.3 From 598f82300abb3ffd6164f7213265808c4779b7cc Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Tue, 20 Jun 2017 11:34:53 +0900 Subject: Remove the qtquickcontrols2 dependency on qtgraphicaleffects The Material style uses its own shader effects, and recent patches did the same for the Imagine style. There were some auto tests that have been made to only run if qtgraphicaleffects is available. Change-Id: Ifcfcad9591d2a0a8d5ebed505566cd0103dd9176 Reviewed-by: Mitch Curtis --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6da4e828..a96b85b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -225,8 +225,8 @@ branch = dev status = ignore [submodule "qtquickcontrols2"] - depends = qtgraphicaleffects - recommends = qtimageformats + depends = qtdeclarative + recommends = qtimageformats qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = dev -- cgit v1.2.3 From 5cd8e9576d453a6d70d110fc0cdc1b9d29dd0365 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 4 May 2020 17:09:56 +0200 Subject: CMake: Switch qtbase Windows config to use Ninja Multi-Config And configure with two configurations, RelWithDebInfo and Debug. This is equivalent to qmake's --debug-and-release --force-debug-info This should give us minimal coverage for debug-and-release builds, as well as avoid regressions with NMC aka multiple configurations. If the qtbase builds successfully, we can try to extend the rest of the repositories to also build with NMC on Windows. We can't add such a configuration to macOS for now, because it requires CMake 3.18, which is not released yet. Disable PCH because it seems to fail the build when used together with Ninja Multi-Config. Task-number: QTBUG-80900 Change-Id: I71a9584ddb1d48ed22925f67b50891e102036c97 Reviewed-by: Joerg Bornemann --- coin/platform_configs/qtbase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index e3811c86..3727c1b7 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -48,7 +48,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From 0685312d2e7d0bbe5bd7d9847aba4366822ce97d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 25 May 2020 15:51:21 +0200 Subject: CMake: Add MinGW config to all cmake enabled repositories Task-number: QTBUG-75578 Change-Id: I4957efff9f3438c85f9e653130898d4b60a555ba Reviewed-by: Joerg Bornemann --- coin/platform_configs/qt5compat.yaml | 5 +++++ coin/platform_configs/qtdeclarative.yaml | 5 +++++ coin/platform_configs/qtdoc.yaml | 5 +++++ coin/platform_configs/qtgraphicaleffects.yaml | 5 +++++ coin/platform_configs/qtimageformats.yaml | 5 +++++ coin/platform_configs/qtnetworkauth.yaml | 5 +++++ coin/platform_configs/qtquick3d.yaml | 5 +++++ coin/platform_configs/qtquickcontrols2.yaml | 5 +++++ coin/platform_configs/qtshadertools.yaml | 5 +++++ coin/platform_configs/qtsvg.yaml | 5 +++++ coin/platform_configs/qttools.yaml | 5 +++++ coin/platform_configs/qttranslations.yaml | 5 +++++ coin/platform_configs/qtvirtualkeyboard.yaml | 5 +++++ coin/platform_configs/qtwayland.yaml | 5 +++++ coin/platform_configs/qtwebsockets.yaml | 5 +++++ 15 files changed, 75 insertions(+) diff --git a/coin/platform_configs/qt5compat.yaml b/coin/platform_configs/qt5compat.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qt5compat.yaml +++ b/coin/platform_configs/qt5compat.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index d085e456..777c6a4c 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -69,3 +69,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtdoc.yaml b/coin/platform_configs/qtdoc.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtdoc.yaml +++ b/coin/platform_configs/qtdoc.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtgraphicaleffects.yaml b/coin/platform_configs/qtgraphicaleffects.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtgraphicaleffects.yaml +++ b/coin/platform_configs/qtgraphicaleffects.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtnetworkauth.yaml b/coin/platform_configs/qtnetworkauth.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtnetworkauth.yaml +++ b/coin/platform_configs/qtnetworkauth.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtquickcontrols2.yaml b/coin/platform_configs/qtquickcontrols2.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtquickcontrols2.yaml +++ b/coin/platform_configs/qtquickcontrols2.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtshadertools.yaml +++ b/coin/platform_configs/qtshadertools.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qttools.yaml b/coin/platform_configs/qttools.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qttools.yaml +++ b/coin/platform_configs/qttools.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qttranslations.yaml b/coin/platform_configs/qttranslations.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qttranslations.yaml +++ b/coin/platform_configs/qttranslations.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtwebsockets.yaml b/coin/platform_configs/qtwebsockets.yaml index e0dd1697..26b05e8c 100644 --- a/coin/platform_configs/qtwebsockets.yaml +++ b/coin/platform_configs/qtwebsockets.yaml @@ -36,3 +36,8 @@ Configurations: Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] -- cgit v1.2.3 From 68134db435b670abb9f785f54e58593e90e1f484 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 26 May 2020 17:00:52 +0200 Subject: Update provisioned CMake version to 3.17.2 This should fix the ninja deps issue we had on Windows with the Ninja Multi-Config generator, where calling ninja a second time to rebuild the project failed. More details at https://gitlab.kitware.com/cmake/cmake/-/issues/20723 Change-Id: I0029e57fbc704120d2241499a87cad0ad40c2e50 Reviewed-by: Joerg Bornemann --- coin/provisioning/common/linux/cmake_linux.sh | 4 ++-- coin/provisioning/common/macos/cmake.sh | 4 ++-- coin/provisioning/common/windows/cmake.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index e2bb13aa..ea2cdf8e 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" majorminorversion="3.17" -version="3.17.0-rc2" +version="3.17.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="5b64ed00a48db524e981b82e3a3a8a14d52091c2" +SHA1="24a68e61292b91c706b09b4aa8044764e2dfb2e2" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index 49943e7d..80b513d6 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" majorminorversion="3.17" -version="3.17.0-rc2" +version="3.17.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz" -SHA1="af50a64bcfbb8dfefae355624b254e3c547dcd3d" +SHA1="918a21481751b19915767649281d623aa60716f4" appPrefix="cmake-$version-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 4246fa02..5d61549a 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -34,7 +34,7 @@ . "$PSScriptRoot\helpers.ps1" $majorminorversion = "3.17" -$version = "3.17.0-rc2" +$version = "3.17.2" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "db10f03227b978a51c76453283f3280fc63c157d" +Verify-Checksum $zip "d4a1d60fccaee7f9a8ceb1ed4fb576a63103a69f" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 4d99fb00cc49171facd3cf9fe379428a8c8fed13 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 27 May 2020 07:57:39 +0200 Subject: Fix CMake provisioning for Ubuntu 18.04 x86_64 QEMU armv7 This amends 68134db4. Change-Id: I2eed240464f1b29c119ca0119001997aefdecd41 Reviewed-by: Maurice Kalinowski Reviewed-by: Oliver Wolff --- coin/platform_configs/qtbase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 3727c1b7..287ac3e1 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Features: ['DisableTests'] - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.0-rc2/bin"] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.2/bin"] Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' -- cgit v1.2.3 From b0d9b22f533c3ad4a814ebbbf0423aafe4f023bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 28 May 2020 12:31:05 +0000 Subject: Combine two macOS targets that are nearly the same MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1c094f02d1cee059272680941b355e4fb2bbdd31 Reviewed-by: Johanna Äijälä Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 7b4183f5..ea70299d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -40,13 +40,8 @@ Configurations: - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Features: ['DisableTests', 'Packaging', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -headersclean -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Features: ['Packaging', 'UseLegacyInstructions'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -headersclean -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' -- cgit v1.2.3 From 91a164b838b7854d3bbb748d36d58f48886c13e9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 2 Jun 2020 13:52:16 +0200 Subject: CMake: Enable CMake builds for qtquicktimeline Task-number: QTBUG-82967 Change-Id: I94324d4ef7d9d393e06a04e2eb1bfb0f9caab971 Reviewed-by: Cristian Adam --- coin/platform_configs/qtquicktimeline.yaml | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 coin/platform_configs/qtquicktimeline.yaml diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml new file mode 100644 index 00000000..26b05e8c --- /dev/null +++ b/coin/platform_configs/qtquicktimeline.yaml @@ -0,0 +1,43 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.1-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] -- cgit v1.2.3 From a10584e57c1be4149b3a067de86fa61c44b8a757 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 2 Jun 2020 16:50:11 +0200 Subject: CMake: Enable CMake builds for qtqa Only includes one MinGW configuration, to mirror what Coin does with the qmake builds of qtqa. Switching the Coin instructions to do license checking and binary compatibility testing using CMake will require a different change. Most likely this change will have to wait until all of qt5.git/dev is moved to use yaml instructions for building, rather than the hardcoded instructions provided by Coin. Besides, the binary compatibility test still depends on finding qmake to run its test, which might have to be changed in the future. Task-number: QTBUG-84233 Change-Id: I5ab7120e965f7729968697abf9e0db602c216cd9 Reviewed-by: Cristian Adam --- coin/platform_configs/qtqa.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 coin/platform_configs/qtqa.yaml diff --git a/coin/platform_configs/qtqa.yaml b/coin/platform_configs/qtqa.yaml new file mode 100644 index 00000000..3ca0b38b --- /dev/null +++ b/coin/platform_configs/qtqa.yaml @@ -0,0 +1,7 @@ +Version: 2 +Configurations: +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] -- cgit v1.2.3