Update submodules on '5.10' in qt5

Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-06 23:16:54 +08:00 · 2018-02-12 08:16:58 +00:00 · 2018-02-10 07:47:25 +00:00 · 2018-02-09 18:36:54 +00:00 · 2018-02-09 12:47:17 +00:00 · 2018-02-08 09:31:00 +00:00
44 changed files with 96 additions and 90 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.10.1
+	branch = 5.10
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.10.1
+	branch = 5.10
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.10.1
+	branch = 5.10
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.10.1
+	branch = 5.10
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.10.1
+	branch = 5.10
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.10.1
+	branch = 5.10
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.10.1
+	branch = 5.10
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.10.1
+	branch = 5.10
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,108 +211,108 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
+	recommends = qtmultimedia qtquickcontrols2
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.10.1
+	branch = 5.10
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.10.1
+	branch = 5.10
 	status = preview
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.10.1
+	branch = 5.10
 	status = preview
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -88,7 +88,7 @@ try
    fi

    echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-    if [ "$proxy" != "" ]; then
+    if [ "$http_proxy" != "" ]; then
        proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
        proxy_port=$(echo $proxy | cut -d':' -f3)
        echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -37,7 +37,6 @@

 # CMake is needed for autotests that verify that Qt can be built with CMake

-# shellcheck source=InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
@@ -37,6 +37,6 @@ set -ex

 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"

-if [ "$proxy" != "" ]; then
+if [ "$http_proxy" != "" ]; then
    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
@@ -51,6 +51,6 @@ gsettings set org.gnome.desktop.screensaver lock-enabled false
 # disable blank screen power saving
 gsettings set org.gnome.desktop.session idle-delay 0

-if [ "$proxy" != "" ]; then
+if [ "$http_proxy" != "" ]; then
    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
@@ -47,6 +47,7 @@ ExceptionGsettings2=101
 ExceptionGsettings3=102
 ExceptionNTS=103
 ExceptionProxy=104
+ExceptionGrub=105

 try
 (
@@ -58,11 +59,14 @@ try
    gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2
    echo "Disable questions on shutdown."
    gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3
+    echo "Set grub timeout to 0"
+    sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub || throw $ExceptionGrub
+    sudo update-grub || throw $ExceptionGrub

    echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
    echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS

-    if [ "$proxy" != "" ]; then
+    if [ "$http_proxy" != "" ]; then
        echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy
    fi
 )
@@ -84,6 +88,10 @@ catch || {
            echo "Failed to disable questions on shutdown."
            exit 1;
        ;;
+        $ExceptionGrub)
+            echo "Failed to set grub timeout."
+            exit 1;
+        ;;
        $ExceptionNTS)
            echo "Failed to set network teset server address into /etc/hosts."
            exit 1;
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh
@@ -94,10 +94,4 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i
 sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i

 # Set QEMU font configuration variables
-qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE"
-qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH"
-
-# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173)
-qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1"
-
-SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\""
+SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\""
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
@@ -7,13 +7,18 @@ source $BASEDIR/../common/shared/network_test_server_ip.txt
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"

 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
+echo "Set grub timeout to 0"
+sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
+sudo update-grub

 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"
 echo 'export DISPLAY=":0"' >> ~/.bashrc
+echo "Disabling file indexing."
+sudo balooctl disable

-if [ "$proxy" != "" ]; then
+if [ "$http_proxy" != "" ]; then
    sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
    sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy
 fi
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	c77d4946b2	Update submodules on '5.10' in qt5 Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-02-12 08:16:58 +00:00
Qt Submodule Update Bot	5611fe34b0	Update submodules on '5.10' in qt5 Change-Id: Ica319a5d98406174ce94d2e3c3784364ab44c642 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-02-10 07:47:25 +00:00
Mitch Curtis	e30de965b9	.gitmodules: update recommended modules for qtvirtualkeyboard The basic example will start using qtquickcontrols2, so recommend that. Remove qtquickcontrols, as it wasn't used. Change-Id: Ieaab1480e6a85ecaa24888fa58024d728d863a16 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>	2018-02-09 18:36:54 +00:00
Qt Submodule Update Bot	b2b076782f	Update submodules on '5.10' in qt5 Change-Id: I06c4afea4e574aa78f37009db512ba25194f6d5d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-02-09 12:47:17 +00:00
Qt Submodule Update Bot	456a4d6453	Update submodules on '5.10' in qt5 Change-Id: I935d6ad075384973425d48782a105a9e3e7d21a0 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-02-08 09:31:00 +00:00
Liang Qi	6cd75cce72	Merge remote-tracking branch 'origin/5.9' into 5.10 Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325	2018-02-07 13:58:54 +01:00
Tony Sarajärvi	c3096caa14	Remove excess comment line for shellcheck Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-02-07 06:30:47 +00:00
Tony Sarajärvi	b4b62658ac	Fix environment variable checking for proxy Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-02-07 06:30:44 +00:00
Qt Submodule Update Bot	052aa06ef4	Update submodules on '5.9' in qt5 Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-02-07 06:30:41 +00:00
Joni Jantti	38649924df	Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0 Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: Ia866000703fdc083407d5d8588ba6680ffd80038 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-02-07 06:30:38 +00:00
Joni Jantti	9fa8b3ca35	Provisioning: openSUSE - Disable file indexing Baloo file indexing sometimes takes up a great amount of CPU capacity and should therefore be disabled. Task-number: QTQAINFRA-1702 Change-Id: I549aef39c1dd2d2fa97196910f577153a42c4f54 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-02-07 06:30:35 +00:00
Joni Jantti	2e329bc68e	Provisioning: openSUSE - Set grub timeout to 0 Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: I67db00d200dc3e5f94ed205b53bb0ca6e70bdd8d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-02-03 20:52:57 +00:00
Qt Submodule Update Bot	88811f882e	Update submodules on '5.9' in qt5 Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-02-03 15:20:59 +00:00