From b6e6882bb7c82a9f4cf702dfd39f0a0ff4a5087f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 11 Sep 2017 13:54:57 +0200 Subject: [PATCH 1/6] Update submodules on '5.9' in qt5 Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index 2e4acacf..837a56fa 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2e4acacfa3a062b8585226500f6cbc65597b8b67 +Subproject commit 837a56fa10b26f129cb0a70caaff9f84e00a3acb diff --git a/qtandroidextras b/qtandroidextras index a511c605..9f70e4b1 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a511c60514d7cc0ff876d13fa4a3800c7e25cbfc +Subproject commit 9f70e4b12b7eaac3f6f727f6d3189779794342f4 diff --git a/qtbase b/qtbase index 68b8f2d4..689606de 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 68b8f2d40858457f4c3433af1e700cef04e121bc +Subproject commit 689606de91faecf91f1f92e8d355789d9be62d2f diff --git a/qtconnectivity b/qtconnectivity index 19e6a952..ae21b257 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 19e6a952d9b736ae9e052d094f908946b4abebe3 +Subproject commit ae21b2574c0000aac6e3b10f7e11ebd1da567ffd diff --git a/qtdatavis3d b/qtdatavis3d index fdc983fb..82f9c8a5 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit fdc983fb3c4ad79cdba282d84a7d8c51ae740965 +Subproject commit 82f9c8a5a246845c746f0a8b3497dceba19ff05b diff --git a/qtdeclarative b/qtdeclarative index 4dbb3c7b..286d72e4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4dbb3c7bc5829bcf699715157d3a82fb86f4ea5e +Subproject commit 286d72e458c10bae3ce11c58a16352a53ba06aef diff --git a/qtlocation b/qtlocation index 8f80da7e..f09e5fb2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8f80da7ea0165adb492c71255d0eea5f08c0af8e +Subproject commit f09e5fb2eaba4a3d3f131fa4a4392ec49d02af0d diff --git a/qtmultimedia b/qtmultimedia index 8b825866..500552d1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8b8258665e4b6e85ca2e012722ad150320c03189 +Subproject commit 500552d11bc5ca2e762875019a15b02d451de1f6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 60eaf0f9..dc398182 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 60eaf0f9432697416abdc758e003c9ac44962324 +Subproject commit dc39818207439a62a97179b8d2ad22ef49521148 diff --git a/qtscript b/qtscript index caecbf64..08b74f4f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit caecbf646c35b9f02ba744756fae2e8797f50e44 +Subproject commit 08b74f4f30c304b80249a593a572808bc1892f66 diff --git a/qtserialport b/qtserialport index 15d0472b..2a828454 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 15d0472bde7a08b2f89b4361f3960486aca259bf +Subproject commit 2a8284543018943ab581202cf934c751a22db6c7 diff --git a/qtspeech b/qtspeech index 42590b06..5393b76f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 42590b0679e9662960db06565a763780f7bf14f0 +Subproject commit 5393b76f3780b0be33cc727458993223605e5ab1 diff --git a/qttools b/qttools index 03855e3d..56026959 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 03855e3dc7f22df38c9e20572beb0828441c204c +Subproject commit 560269593ba6642e6cb7915a64853a4457f4afe8 diff --git a/qtwayland b/qtwayland index bde5619e..3f400e31 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bde5619e2090efdc16823de21ff5cb76805204bd +Subproject commit 3f400e31fecd1c0436ad17d1be1dae7745c6a4f5 diff --git a/qtwebchannel b/qtwebchannel index 228184f9..dd04d747 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 228184f93b4d39e1aca9e53fde8e576f71b90c93 +Subproject commit dd04d74769e1859d571de7c4f2e88cb85a227ab9 diff --git a/qtwebengine b/qtwebengine index ad55613c..f6dc11e9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ad55613c2648edb67353c3882d1956b54fc323b4 +Subproject commit f6dc11e9b589ae80a6665424b94c5e23567ea9d6 diff --git a/qtwebview b/qtwebview index e4016a67..01ff5c0d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e4016a67bbffefed71a407494e249e978d212b3d +Subproject commit 01ff5c0d5f937577cfd2391a43af4180f2a484bb From 528580bbcd2a2cd432a22efd6a7209c56c4fbb3e Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 2 May 2017 11:34:30 +0200 Subject: [PATCH 2/6] Install python3 on all platforms This forward-ports commit a99d3432f71c4be5045ae2cdcc3b7070de5abe23 to 5.9, which should have been done in 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb but accidentally left out. It reuses parts of commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74 that was initially cherry-picked to 5.6. Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 15 ++++++++++++++- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ .../08-pythondev.sh | 8 ++++++++ .../qtci-macos-10.12-x86_64/025-python3.sh | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh index ad1bf18f..ff25f463 100644 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -1,5 +1,18 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside -sudo subscription-manager refresh sudo yum install -y python-devel python-virtualenv + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +sudo rpm -Uvh epel-release-latest-7.noarch.rpm +sudo rm -f epel-release-latest-7.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 593b7c5b..f07be55a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -82,6 +82,8 @@ try sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT + # python3 development package + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh new file mode 100644 index 00000000..254b738d --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -0,0 +1,8 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo pkcon -y refresh +sudo pkcon -y install python-devel python-virtualenv + +# install python3 +sudo pkcon -y install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" From b1c268a8eb91eea35bf7592d24de0745c309f693 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 12 Sep 2017 10:32:14 +0200 Subject: [PATCH 3/6] Build examples also on Linux with namespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change we get coverage for namespace related build breakages in examples of Linux-only modules, such as wayland. Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c Reviewed-by: Tony Sarajärvi Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 63c54671..acfeba93 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7 MSVC2015 qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation +qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker From 4b0e2f79c1e7fc8b09a9ea61c78e92581e070c3f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 12 Sep 2017 14:40:34 +0200 Subject: [PATCH 4/6] Update submodules on '5.9' in qt5 Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 837a56fa..cd467d5f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 837a56fa10b26f129cb0a70caaff9f84e00a3acb +Subproject commit cd467d5ffc6eaaa7da089ab4acc5284cd11d1109 diff --git a/qtbase b/qtbase index 689606de..10601aa7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 689606de91faecf91f1f92e8d355789d9be62d2f +Subproject commit 10601aa7d2aea597ae5127ef83cea3c7549d5712 diff --git a/qtdeclarative b/qtdeclarative index 286d72e4..78d574a9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 286d72e458c10bae3ce11c58a16352a53ba06aef +Subproject commit 78d574a909a4bcf7543fba8d921e8658dfbc0200 diff --git a/qtlocation b/qtlocation index f09e5fb2..b13ff055 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f09e5fb2eaba4a3d3f131fa4a4392ec49d02af0d +Subproject commit b13ff055eb64970f545ba590735a38652de7689b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dc398182..d3aef722 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dc39818207439a62a97179b8d2ad22ef49521148 +Subproject commit d3aef722da533c3b100ba653498c79986a44c9f9 diff --git a/qtscxml b/qtscxml index a1dff1a1..16956a96 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a1dff1a11ad303a1f82f181e6386194de90ec08f +Subproject commit 16956a965817311fbc9d80ffbee74eb5d9ea00e0 diff --git a/qtwayland b/qtwayland index 3f400e31..8828bf4d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3f400e31fecd1c0436ad17d1be1dae7745c6a4f5 +Subproject commit 8828bf4dbeb90e479b3b461905f974774d6e20a4 diff --git a/qtwebengine b/qtwebengine index f6dc11e9..e409cfca 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f6dc11e9b589ae80a6665424b94c5e23567ea9d6 +Subproject commit e409cfca1765aad5f6cc09c0e0ebd019dd5b37e2 From 57043fb07bfc30e2f045c2c4ce2cd18fb2a64e48 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 15 Sep 2017 13:38:26 +0200 Subject: [PATCH 5/6] Clean up QNX patching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches from ci-files01 instead. Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f Reviewed-by: Simo Fält --- coin/provisioning/common/patch_qnx.ps1 | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 index 2fca7b67..632859a0 100644 --- a/coin/provisioning/common/patch_qnx.ps1 +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -44,7 +44,7 @@ $zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" $sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" $tempDir = "C:\temp\qnx_path" -Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip Verify-Checksum $zip $sha1 Extract-Zip $zip $tempDir Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh index 19993ecc..ad5c90d3 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -60,5 +60,5 @@ function InstallZipPackageFromURL { echo "Patching QNX" -baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" From 6dd41c84067a213fa98d9b59aed2601a982bf665 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Sep 2017 07:44:31 +0300 Subject: [PATCH 6/6] Update submodules on '5.9' in qt5 Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index cd467d5f..75697d59 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cd467d5ffc6eaaa7da089ab4acc5284cd11d1109 +Subproject commit 75697d59cb6e3783bd1444816cfc90b4bc8b9aba diff --git a/qtbase b/qtbase index 10601aa7..81a19050 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 10601aa7d2aea597ae5127ef83cea3c7549d5712 +Subproject commit 81a19050d8127e7b05006f793a8797c8f5248191 diff --git a/qtcharts b/qtcharts index 524229e3..f2aaf5f3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 524229e31d7f8141c3f91cdad2cffa36131d6789 +Subproject commit f2aaf5f3b528f954c4ff7b3e6a79acae157cec5e diff --git a/qtdeclarative b/qtdeclarative index 78d574a9..bfab1db3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 78d574a909a4bcf7543fba8d921e8658dfbc0200 +Subproject commit bfab1db38167d31f0487f96d2d4b02d9243bc777 diff --git a/qtlocation b/qtlocation index b13ff055..eb381288 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b13ff055eb64970f545ba590735a38652de7689b +Subproject commit eb3812884d63ffc014f4ac76214e65a6497ae827 diff --git a/qtmultimedia b/qtmultimedia index 500552d1..d41bce99 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 500552d11bc5ca2e762875019a15b02d451de1f6 +Subproject commit d41bce99a531a7968f8c5bc8ec88965372341bd9 diff --git a/qtqa b/qtqa index b6dbaed8..cdfda1b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b6dbaed8d73ded89d28b1ffd41dacb97a0b62b1c +Subproject commit cdfda1b40ac125bc5639582b0cea05d68e7b6993 diff --git a/qttools b/qttools index 56026959..fce89784 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 560269593ba6642e6cb7915a64853a4457f4afe8 +Subproject commit fce8978426b9dbad8ea60412ba34d855a9c90a24 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index dd8c39ea..f3683d17 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit dd8c39ea9312ec1441b3fdd830f9d42fe3258b58 +Subproject commit f3683d17c364c4f84f1591dd60121041628f9a5c diff --git a/qtwayland b/qtwayland index 8828bf4d..3cb09edd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8828bf4dbeb90e479b3b461905f974774d6e20a4 +Subproject commit 3cb09edd71745edda4bbe8de3a6d7ad8e4ea5f58 diff --git a/qtwebchannel b/qtwebchannel index dd04d747..d84318e9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit dd04d74769e1859d571de7c4f2e88cb85a227ab9 +Subproject commit d84318e98aa3cbac11b4f95b3581e95aab96a34a diff --git a/qtwebengine b/qtwebengine index e409cfca..a12a8110 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e409cfca1765aad5f6cc09c0e0ebd019dd5b37e2 +Subproject commit a12a811026baa86d7d8e4728d893114c76feec20