From 9dd445123465dde1089d2c0285add1db225ccec3 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 20 Aug 2019 11:07:46 +0300 Subject: Android: Update Android NDK to version r20 Fixes: QTQAINFRA-3152 Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5 Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/platform_configs/default.yaml | 4 ++-- coin/platform_configs/qt5.yaml | 14 +++++++------- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/windows/android-openssl.ps1 | 2 +- coin/provisioning/common/windows/android.ps1 | 4 ++-- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 8de9e023..18ea85f3 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -113,7 +113,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' @@ -121,7 +121,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index b72ab7c2..c164eb44 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -41,7 +41,7 @@ Compiler: 'GCC' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch x86' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -49,7 +49,7 @@ Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - 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-r19c -android-arch armeabi-v7a' + 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 -android-arch armeabi-v7a' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -57,7 +57,7 @@ Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - 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-r19c -android-arch arm64-v8a' + 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 -android-arch arm64-v8a' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -65,7 +65,7 @@ Compiler: 'Mingw73' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - 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-r19c -android-arch x86' + 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 -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -73,7 +73,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -81,7 +81,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -89,7 +89,7 @@ Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5840d4b4..1e151efe 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" +ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 981fa51d..fb5c5aab 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -51,7 +51,7 @@ $sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" $destination = "C:\Utils\openssl-android-master" # msys unix style paths -$ndkPath = "/c/Utils/Android/android-ndk-r19c" +$ndkPath = "/c/Utils/Android/android-ndk-r20" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index def09116..537e14a2 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r19c" +$ndkVersion = "r20" $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" -$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" +$ndkChecksum = "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 544364b0..1886cce3 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version -- cgit v1.2.3 From 5f8a9b15ded9e1c32cf98275c32231e670b6b4f0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Aug 2019 15:24:27 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt3d b/qt3d index 87abbae2..9517e406 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 87abbae2f16bae53aff6b2e41658bafbef642a95 +Subproject commit 9517e406e64ae0d28e83c49334d8e7dc854516ef diff --git a/qtactiveqt b/qtactiveqt index 89e2d977..e9f78ada 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 89e2d977323e874b4074aa1b969a4be5141184b8 +Subproject commit e9f78adad0205ff539a35587be86c8e7a0bfd5bd diff --git a/qtandroidextras b/qtandroidextras index 503ba3db..e3771f91 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 503ba3db8749b49ed2e4705fd353c897dae390a5 +Subproject commit e3771f91b466e356276e703d1a02bfe11f93a29a diff --git a/qtbase b/qtbase index 50e496bd..a4d19654 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 50e496bd3ac71ccebc99c0a429b41fb0e7864ac2 +Subproject commit a4d19654edec88b5ca0a2516c1b2038ad309ca6d diff --git a/qtconnectivity b/qtconnectivity index ccc1544f..a309d04f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ccc1544f5ff929f466df8c790a4e7595e177a720 +Subproject commit a309d04fa1edb3fa320d420758b3967616ad792a diff --git a/qtdeclarative b/qtdeclarative index d4e1f539..c400b776 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d4e1f5395c896dc5bda9a2e122e2ed0f45be6c18 +Subproject commit c400b7765ff5204edf9243387f1928a770985382 diff --git a/qtdoc b/qtdoc index c7a53256..68f41f4c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c7a53256d262ba58e59ebc3863c21c7b6cd2f0c8 +Subproject commit 68f41f4c35e3a400bd48ab6a9e544d3fd8544062 diff --git a/qtimageformats b/qtimageformats index 82a6d342..5214bcd3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 82a6d3426215253e013dd3ddd6712488388bc926 +Subproject commit 5214bcd3d868664bb057f2689c02ec263bbc980b diff --git a/qtlocation b/qtlocation index 3334c6f6..5ba1ffc3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3334c6f6d00255f6fd5690e4b9cb05416950fd4d +Subproject commit 5ba1ffc31227e652f98eb27c47e20a42f197f6b6 diff --git a/qtmultimedia b/qtmultimedia index 9178132f..8972b268 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9178132f75563cd0e907525f08736c1b4cec73b4 +Subproject commit 8972b26890b9c4d7e82cc47a4864fda0a8a78ff4 diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 diff --git a/qtremoteobjects b/qtremoteobjects index d88c6a16..97d48160 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d88c6a1690d1d725e4436537546b3d5681ee4a9f +Subproject commit 97d481601c63f5e36ecd7cde883b79011ead154a diff --git a/qtscript b/qtscript index 40b5d325..44a9b1ff 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 40b5d325b6105d4e520c76a079f530168b58efec +Subproject commit 44a9b1ffbbd6ea127a2e8ce22dd5d87ef7474faf diff --git a/qtsensors b/qtsensors index 4dfa9553..f8f2c4a5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4dfa95538ff15f59880c93675676ce609b365d89 +Subproject commit f8f2c4a5d0640090fd50656b1b585c0c3a0936bb diff --git a/qtserialbus b/qtserialbus index 556c6b67..45f9593e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 556c6b67315c25f7e4359ab19314f3485f10ecc6 +Subproject commit 45f9593eff1141e7a86cda4f3dd2380c237c9f54 diff --git a/qtsvg b/qtsvg index b80a1676..9d274388 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b80a1676c9f5cc0b428f15ac09f6648a80aacb26 +Subproject commit 9d274388f620dfafe0bc8fe0855ce0c8e8ae7892 diff --git a/qttools b/qttools index eba0529d..3d544cbc 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eba0529d488536e83b1e32b1c1c6c1000790e329 +Subproject commit 3d544cbc55253dd35b3c7ccfd223b56de140aa84 diff --git a/qtwayland b/qtwayland index 52b65607..622b55e9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 52b6560708ebcfeeaebdf2b43f368c610aa905a4 +Subproject commit 622b55e918bfc877c10f8885754b30b593d334a5 diff --git a/qtwebengine b/qtwebengine index 23b24fb4..ee7ac44d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 23b24fb49a9115151ea086afd271fdf9bb36fda0 +Subproject commit ee7ac44d4c8903ac7c169d82999474365e361f91 diff --git a/qtx11extras b/qtx11extras index 15ffa33a..a0443bd7 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 15ffa33a162325d2d16437a057e79cd3b0e3d61c +Subproject commit a0443bd723601205c8cc4666dd89be5a32decf98 -- cgit v1.2.3 From ff75bd52975918eef5711826356143e9e8a90180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Mon, 19 Aug 2019 15:10:15 +0200 Subject: Add QtQuick3D as a submodule in qt5.git Adds QtQuick3D as a preview module in dev Task-number: QTBUG-77724 Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a Reviewed-by: Andy Nichols --- .gitmodules | 6 ++++++ qtquick3d | 1 + 2 files changed, 7 insertions(+) create mode 160000 qtquick3d diff --git a/.gitmodules b/.gitmodules index b3c46af7..ef01576e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -318,3 +318,9 @@ url = ../qtquicktimeline branch = dev status = preview +[submodule "qtquick3d"] + depends = qtbase qtdeclarative + path = qtquick3d + url = ../qtquick3d.git + branch = dev + status = preview diff --git a/qtquick3d b/qtquick3d new file mode 160000 index 00000000..03dbcc5e --- /dev/null +++ b/qtquick3d @@ -0,0 +1 @@ +Subproject commit 03dbcc5eb3364886ee8ffc07b4438eaee3c188fe -- cgit v1.2.3