From 88811f882e48b4f03d54224b7eff3fe28213e856 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 2 Feb 2018 17:29:56 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qt3d b/qt3d index 02ebfda6..ceae7436 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 02ebfda6c3aaedd2becdc4f0ce4a39025e95b726 +Subproject commit ceae743678d41a58154612781e896c04c87a8c4f diff --git a/qtactiveqt b/qtactiveqt index 15c9ffc2..d895e5d8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 15c9ffc20f205e32b9297249be944bcbedd84fc7 +Subproject commit d895e5d8f11afb1b4fef7d4962490146c7c251ce diff --git a/qtandroidextras b/qtandroidextras index cd6fc729..aa7acf47 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit cd6fc729f32ed01ec52b7aad4be463c8161240bf +Subproject commit aa7acf474f58c0c33666386493f867aead8a853e diff --git a/qtbase b/qtbase index 4cd90a35..b7e43673 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4cd90a3579986ae7441c3e982a5f34cdfd92c152 +Subproject commit b7e436738756b1d5d7a45201b7a7204d7fe128a1 diff --git a/qtcanvas3d b/qtcanvas3d index e8c0f4eb..08b2b003 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit e8c0f4eb3e3ffebad02eee7b6bfecf0a3c573f1d +Subproject commit 08b2b0033d734710ced9050e71a79e094257462a diff --git a/qtcharts b/qtcharts index a2eb6b3b..31127e1f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a2eb6b3b15e19d5c8215c41694ce8c74918cb58a +Subproject commit 31127e1f2926c3f2d3c25060b1c3e3a8cf9e6950 diff --git a/qtconnectivity b/qtconnectivity index df376c4c..234907ae 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit df376c4c27d16f70ba69925553acfc69287b269a +Subproject commit 234907ae5fc3dd5b9e5c3b0fa76d65f986104a27 diff --git a/qtdatavis3d b/qtdatavis3d index 172dbad2..8bfa8a8e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 172dbad2db094148323fd8a9e6ab44c72a9fa88e +Subproject commit 8bfa8a8ef3500744e1c26e1a82391186c44812ef diff --git a/qtdeclarative b/qtdeclarative index 922ce0ef..6958308c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 922ce0ef39302a8d6d306a09295cbae857becbc4 +Subproject commit 6958308c09ceda855a30c5a2d491f078c5104071 diff --git a/qtdoc b/qtdoc index b5d003d0..81d8e665 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b5d003d00c114a6824ef45bee027a72e309fc009 +Subproject commit 81d8e665204ed6b9facabf5d170dd91acc06c36c diff --git a/qtgamepad b/qtgamepad index d252eb8a..da6d567a 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit d252eb8ae4f99a5ad193662a493aa17044aef434 +Subproject commit da6d567a54292f2c6c2f43af647b576be8c9a8f0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index ddee9ff8..8e86608f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit ddee9ff8217d307b962c033ea632bfe3ef683acc +Subproject commit 8e86608f28b168b6a0e7ee5dbd56ec7d2e55b09b diff --git a/qtimageformats b/qtimageformats index 3c607b32..00e422c3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3c607b324ffbf84ce9803d80a04c7d663e847496 +Subproject commit 00e422c39b3c190acbf5609247a4172b45281d15 diff --git a/qtlocation b/qtlocation index 68b5ee9e..66ba05c8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c +Subproject commit 66ba05c88524023012efdb76d54d48f47411a5a4 diff --git a/qtmacextras b/qtmacextras index 5e0178d3..970a1017 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5e0178d350c3f59fe327b5a5c89beb4f48efca2f +Subproject commit 970a10176cc6f43e1fa78883bbd7e27ea1100b26 diff --git a/qtmultimedia b/qtmultimedia index f4ed0d41..fb477cdb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f4ed0d4178ecdf50cdaca47716a5101a28494157 +Subproject commit fb477cdb126848e416845df348ca4031ccc2f87b diff --git a/qtnetworkauth b/qtnetworkauth index eee494c1..e62fdc98 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit eee494c12a70fa0aa6fce427f47f44ff60281dca +Subproject commit e62fdc9887d4bdc2d1cfd07c918dd15cd1992baf diff --git a/qtpurchasing b/qtpurchasing index 34796716..a58433b7 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 3479671699f5a6cb13e002762dc35398b66066fd +Subproject commit a58433b78f0b06a1f0594e9fcee9601e0170fdc4 diff --git a/qtquickcontrols b/qtquickcontrols index a8438846..93c5dc8b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a843884697602891d21b9f9bc62603548dd6a6b8 +Subproject commit 93c5dc8b5abdbdfca505dd4d3d9892856d1f51d7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c3858bd5..223c1524 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c3858bd53974e486e03537d1937deb0020828556 +Subproject commit 223c1524a7693e2c0f2312dd738c6aeb484358a5 diff --git a/qtremoteobjects b/qtremoteobjects index 286f3c62..dc2a2777 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 286f3c626087635cb24708b8e42b1d8af0401640 +Subproject commit dc2a27771daefefe746310fd25aa06f716df0976 diff --git a/qtscript b/qtscript index 8399cdfb..36e82de4 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 8399cdfbaf2aceab9c22fdcb10d2369ddb39b5df +Subproject commit 36e82de4386aed1fcc9b24b944e01d807a0f709f diff --git a/qtscxml b/qtscxml index 86983e53..0d610556 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 86983e533aec1cf1095fec643dc6b1b9029fd456 +Subproject commit 0d6105563d5e53356dfdae64bcb19a1e8e4db6b8 diff --git a/qtsensors b/qtsensors index 01186d63..dcc4d0b5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 01186d63a0e585d6eb432271371dd3cd489dc905 +Subproject commit dcc4d0b58a4fe0432d3ac86f1f2bd132e40be424 diff --git a/qtserialbus b/qtserialbus index 81b1ae51..38c64b11 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 81b1ae518792a9c1a2417c3a05b87eb5dc7ebc13 +Subproject commit 38c64b11c9538ec9e5c880bfa84a56630c7f2ae7 diff --git a/qtserialport b/qtserialport index c0bdb69f..6f62e9de 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c0bdb69f432117e9119866bd610aea87d3eb4ee1 +Subproject commit 6f62e9de520a50a7bc90241d4a5d2c385a25373f diff --git a/qtspeech b/qtspeech index 16ab9c26..fd6648b0 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 16ab9c262b1d53222913da96f7a14485e3ef0836 +Subproject commit fd6648b0b77dc628e89655f5dc271dbc42ca829c diff --git a/qtsvg b/qtsvg index 74eb2d7d..a2156af9 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 74eb2d7d0268492c95779cb6029393aa1de67e05 +Subproject commit a2156af9ed6bc3e57f715dfe6784a2249ee5fa35 diff --git a/qttools b/qttools index f1233878..21f39607 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f1233878fef715c0746dcb6af7164acfb46fd418 +Subproject commit 21f3960738bf73e4663bde5108d8859367efb66f diff --git a/qttranslations b/qttranslations index b3684346..97a0f2e1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b3684346bd60983cecf2524f9f8081df514b5cb0 +Subproject commit 97a0f2e132983018473886eb1e3f5ac761839c6e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 34123d6d..88be503a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 34123d6db47e213a66e855d8895030a2a5979c0b +Subproject commit 88be503aa376a906fa003c5e89d45c47c69d8ca4 diff --git a/qtwayland b/qtwayland index 9f1db9d0..79cde9fb 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9f1db9d0ae60ffe8be1453a57be3b8f2861e4882 +Subproject commit 79cde9fba8452afba049f4fd611dfe9cf8f1be12 diff --git a/qtwebchannel b/qtwebchannel index 97d2deb5..5821cad4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 97d2deb55b854fd2b97efc0a5b41da28444c6e78 +Subproject commit 5821cad4caac94d94994998602a9c0594c91f69f diff --git a/qtwebsockets b/qtwebsockets index 78607d65..0b418f55 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 78607d656e18717e2edb5e0430e7eeefaf24fa8b +Subproject commit 0b418f5512943eca6059855a584902f70a5dbadb diff --git a/qtwebview b/qtwebview index f016c778..c47248d9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f016c7781fb418fd57bae62d22ce46f8711de62a +Subproject commit c47248d9a297d0b121c723377b6d44dc9f876603 diff --git a/qtwinextras b/qtwinextras index d4985a34..f688deb0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit d4985a348ccb2e3b83d64dbc95f5f2bab83e9bc6 +Subproject commit f688deb091537884517a0fb4bda7bd6cb8dcdada diff --git a/qtx11extras b/qtx11extras index 922a92b5..def0ad51 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 922a92b533edc9bbefee729a8d91b28fbe0e3945 +Subproject commit def0ad5122a4549b903736fa7a8cc68d936ad3f3 diff --git a/qtxmlpatterns b/qtxmlpatterns index 07fdc1b9..4d95d643 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 07fdc1b94d816b1c785af69a36fd8f756b7964af +Subproject commit 4d95d64382eefcb50bea5d900989cb24d56bf656 -- cgit v1.2.3 From 2e329bc68eb5af977dca1982ed608dc058fdf7f9 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 30 Jan 2018 12:22:32 +0200 Subject: Provisioning: openSUSE - Set grub timeout to 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git 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 index 4ebc1b44..d76364a8 100755 --- 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,6 +7,9 @@ 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 -- cgit v1.2.3 From 9fa8b3ca357a63e5bbb296beadee3c83357fa1cf Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 2 Feb 2018 11:19:35 +0200 Subject: Provisioning: openSUSE - Disable file indexing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git 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 index d76364a8..d5439f0e 100755 --- 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 @@ -15,6 +15,8 @@ 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 sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy -- cgit v1.2.3 From 38649924dfc0a6da0a6a5573b95511191ae44310 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 30 Jan 2018 12:11:58 +0200 Subject: Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git 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 index 6c198b1d..76277f02 100755 --- 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,6 +59,9 @@ 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 @@ -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; -- cgit v1.2.3 From 052aa06ef41a790513b0fb08a39b8df023c7f5a5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Feb 2018 09:19:55 +0100 Subject: Update submodules on '5.9' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index b7e43673..1cc15c4b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b7e436738756b1d5d7a45201b7a7204d7fe128a1 +Subproject commit 1cc15c4b6d65a22ab4018226a96baf843feb1f00 diff --git a/qtconnectivity b/qtconnectivity index 234907ae..a7be018d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 234907ae5fc3dd5b9e5c3b0fa76d65f986104a27 +Subproject commit a7be018dfae73e4e2a68fd82e775d05d52aea983 diff --git a/qtdeclarative b/qtdeclarative index 6958308c..f70c0cee 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6958308c09ceda855a30c5a2d491f078c5104071 +Subproject commit f70c0ceee44b6e36696e33a9c4df278e1c40daa6 diff --git a/qtmultimedia b/qtmultimedia index fb477cdb..c98c346d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fb477cdb126848e416845df348ca4031ccc2f87b +Subproject commit c98c346d12b1a6ba99d18059db5b941d6138b081 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 223c1524..7eb5f8a5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 223c1524a7693e2c0f2312dd738c6aeb484358a5 +Subproject commit 7eb5f8a54bdcf0520a7aa0a2874a059060866097 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 88be503a..1838b75f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 88be503aa376a906fa003c5e89d45c47c69d8ca4 +Subproject commit 1838b75f6c21d71e7bd88b03e44c07287879a4e8 diff --git a/qtwebengine b/qtwebengine index adb86777..e864d865 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit adb8677717472e020e35084839ab3726920ec386 +Subproject commit e864d8656c2682fc79a5affe789992de318c8f8a -- cgit v1.2.3 From b4b62658ac231dbcc17360dcc946117d1be39ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 30 Jan 2018 23:52:33 +0200 Subject: Fix environment variable checking for proxy Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51 Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/android_linux.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 76db19d4..a7b83fd7 100755 --- 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 diff --git 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 index 90b32d0d..fc07e6fa 100755 --- 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 diff --git 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 index a7718d96..bf97a166 100755 --- 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 diff --git 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 index 76277f02..e00e2498 100755 --- 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 @@ -66,7 +66,7 @@ try 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 ) diff --git 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 index d5439f0e..c0e7b8e9 100755 --- 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 @@ -18,7 +18,7 @@ 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 -- cgit v1.2.3 From c3096caa14393690df2d6bdb79b144924c56f22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 1 Feb 2018 08:32:35 +0200 Subject: Remove excess comment line for shellcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/cmake_linux.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 98af57c8..7154d822 100755 --- 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" -- cgit v1.2.3