From 3bfa9b0b12eb5a6b463466e271df4881c39b040d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Jan 2018 15:51:09 +0100 Subject: Update submodules on '5.9.4' in qt5 Change-Id: Id238fb2be13cf7782a225e43e1d31ab195f56007 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtx11extras | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 451ca492..9647c0b5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 451ca492ea5f71045597f26db54c840addb6d6ae +Subproject commit 9647c0b54f1aa0ffdf3a6d23a80a0802c6f3e343 diff --git a/qtbase b/qtbase index 44da5b86..d5a11a0e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 44da5b863597e761df3545dc7ff02a9b53bbb13d +Subproject commit d5a11a0ec206f6b9e7fd50b37717ca820d6ab98a diff --git a/qtdeclarative b/qtdeclarative index 78a5add7..0dbdfaa7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 78a5add79497300802c2152b5bf561b6bef305f1 +Subproject commit 0dbdfaa78d9c3ac0c1a9cfff440d753b159a3a14 diff --git a/qtimageformats b/qtimageformats index 1225d9e4..3c607b32 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1225d9e4aac319cb92ef88ebf7de305033ef30ba +Subproject commit 3c607b324ffbf84ce9803d80a04c7d663e847496 diff --git a/qtlocation b/qtlocation index 7508f021..844e0e4a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7508f02176f317db50f20985205bf64af8134ab6 +Subproject commit 844e0e4aec3285ec5cfde90422acd796bc4d7d39 diff --git a/qtmultimedia b/qtmultimedia index c8bf0cd3..13df2988 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c8bf0cd37c5f526e3687dfeff9e23d15104328b5 +Subproject commit 13df2988efbe9a82225ccbf4cad463391d94c8e8 diff --git a/qtqa b/qtqa index 956200a1..eaf59453 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 956200a160b0a1a9a15bbcd24c6c82e4dc01c2b6 +Subproject commit eaf59453eb1ea44fca63263dc25da473e624df6c diff --git a/qtquickcontrols b/qtquickcontrols index a60d3e0d..8da20dde 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a60d3e0df7085d077aaed93d9243cf3d57b59464 +Subproject commit 8da20ddef88cb48b7bb09ff7dc1db6517add8e72 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 31a65540..99264fcf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 31a655402ff194e556853e6877f1a464a8e51243 +Subproject commit 99264fcfb98c01040a1edccba70ce7c268c41de4 diff --git a/qtscript b/qtscript index ef6c88d3..8399cdfb 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ef6c88d329386ece5b4a92d6a0865d7b90e036c0 +Subproject commit 8399cdfbaf2aceab9c22fdcb10d2369ddb39b5df diff --git a/qtserialbus b/qtserialbus index 50aea4ad..1b263f6a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 50aea4ada4521f009ea8524b91daea1fac283c41 +Subproject commit 1b263f6a56c14e04e92310998303d8f815dba8f8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cb5fab80..e078c5e2 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cb5fab803f3227f4c678a6a694d907fc385c7b05 +Subproject commit e078c5e237142270f5d85a22a1e8adc969668695 diff --git a/qtwayland b/qtwayland index 154bdf45..70fc4900 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 154bdf45dd51a521058c820e7b871008ce8508ae +Subproject commit 70fc4900ee70e786b615e1f31201564b946fd0ac diff --git a/qtwebchannel b/qtwebchannel index 44a2c000..b90fbebb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 44a2c0006546ba39a4a523904f75a9cb01cfe5fc +Subproject commit b90fbebbb5e257f771e96980109fb543647b1844 diff --git a/qtwebengine b/qtwebengine index 17ecc4e7..6f242a93 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 17ecc4e7e0c88d891e1b18d5810a7ac2fd0b83ba +Subproject commit 6f242a9389369242b23a61dcb59fc610dc27bb05 diff --git a/qtwebview b/qtwebview index 4d4b118c..a14f37e7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4d4b118c1294d96741d71a775ac1c57b5acb96bb +Subproject commit a14f37e76b429876015ee96cc4adb97ed4c9fbed diff --git a/qtx11extras b/qtx11extras index aee4dc63..922a92b5 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit aee4dc63f6d43cf775c063b76d789ac6d4a8f517 +Subproject commit 922a92b533edc9bbefee729a8d91b28fbe0e3945 -- cgit v1.2.3 From 5f022e578593ccd64d438976f22140c264864362 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Jan 2018 11:29:41 +0200 Subject: Update submodules on '5.9.4' in qt5 Change-Id: I9d1b498fc931464636734fc30b7852645383fc9c Reviewed-by: Jani Heikkinen --- qtandroidextras | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qtwebchannel | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index cb2fa645..e243a0e5 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit cb2fa645bef1a0c05065fe43a038e5bf962e095b +Subproject commit e243a0e5281f07dfe500baf2d1cabef6fea8a263 diff --git a/qtcanvas3d b/qtcanvas3d index 25f6b209..6fb3a31e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 25f6b209a64a3c7e16e1c4655a970aaf5f4341cc +Subproject commit 6fb3a31e79731b27eccb7ff816a73df6b6b5f14c diff --git a/qtcharts b/qtcharts index ad9d59e8..0bc38b76 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ad9d59e871b6f1a7b3f0b0ae1248ffa205647993 +Subproject commit 0bc38b76e2aca205a0a96cc637395652d31684ba diff --git a/qtdeclarative b/qtdeclarative index 0dbdfaa7..323f4886 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0dbdfaa78d9c3ac0c1a9cfff440d753b159a3a14 +Subproject commit 323f4886dcb99c419568802b96db88ddc9cba111 diff --git a/qtdoc b/qtdoc index a83a49af..8668ce16 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a83a49aff24964803ddee737bd3b172ce3003290 +Subproject commit 8668ce1602596ba1fa23afadad28083d5372f599 diff --git a/qtgamepad b/qtgamepad index 7eaac052..992c0825 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 7eaac052282038dc9a05afe7b48fa4676f6876b5 +Subproject commit 992c0825c5bd56a0051b2ffdcd7f7c3458c2ae4f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 9b6d754d..5d6bcadd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 9b6d754d192ae53306b8fe6277b0bbe84bde53d6 +Subproject commit 5d6bcaddf72093b29b4811b60ae663a7705bd95a diff --git a/qtmacextras b/qtmacextras index 26ce599c..06b4342c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 26ce599c8ffdae9b001ec9dc7d5639ff0b528066 +Subproject commit 06b4342c434d6f309df65719a7abbed341888231 diff --git a/qtmultimedia b/qtmultimedia index 13df2988..d405f875 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 13df2988efbe9a82225ccbf4cad463391d94c8e8 +Subproject commit d405f87569b47d8e420f7bc6aee04f477663c92e diff --git a/qtpurchasing b/qtpurchasing index acdce943..37745906 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit acdce9431b5ead5754e149853839569ffbd9e200 +Subproject commit 37745906df0f7d19ccd1f70991091266f6d7ce67 diff --git a/qtrepotools b/qtrepotools index 14431b40..07f8dbb0 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 14431b4087125e247c1e2322e0cd043b78974ce2 +Subproject commit 07f8dbb095e4905d2d43e1527ce5616d047a3ae9 diff --git a/qtscxml b/qtscxml index 866816d5..6950e4cf 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 866816d57204dc60bb9d0a8b5157c4cf7addd214 +Subproject commit 6950e4cf63a575925b829a8ca7424c55dac77066 diff --git a/qtsensors b/qtsensors index e2a5bf08..e94bbed1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e2a5bf08c4d9239ff1da88b4d35e9bb89133a940 +Subproject commit e94bbed18aaa4461af68727fb9a41076b4669676 diff --git a/qtserialport b/qtserialport index 5fdcd2f6..f1b44e67 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5fdcd2f60021771d301743f51852db05ea45cdf2 +Subproject commit f1b44e67578b38732668c75b2549e4a8f9ea3f91 diff --git a/qtsvg b/qtsvg index 808ae358..fc81943b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 808ae3589a031413e25d7b6e66f2e966cefacb96 +Subproject commit fc81943b3eb88227b9fa0a5e8afaaad65d3174fc diff --git a/qtwebchannel b/qtwebchannel index b90fbebb..2661593d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b90fbebbb5e257f771e96980109fb543647b1844 +Subproject commit 2661593df95b8a5a56af0a8fd22af5be7f7ea8fb diff --git a/qtwebsockets b/qtwebsockets index bd08a6ba..fc5247f6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bd08a6ba75ed04089fb2fa3e763ade8ebc1ef9da +Subproject commit fc5247f669d0aecfef861191682fba5518175e34 diff --git a/qtwebview b/qtwebview index a14f37e7..e00b5892 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a14f37e76b429876015ee96cc4adb97ed4c9fbed +Subproject commit e00b5892ac4c658ac9e26168bc027031dcac0110 diff --git a/qtwinextras b/qtwinextras index 13042633..55fb3379 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 130426337da1703ed3c0d9d84f4ccbd96c561336 +Subproject commit 55fb3379d15cd3e074dfb1f1c5ce278e15bd7a78 diff --git a/qtxmlpatterns b/qtxmlpatterns index f5f2b1f5..757fc816 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit f5f2b1f5fc29968b13b464cc9a6b2df6eebe75c7 +Subproject commit 757fc816578fcc9b6bf6f787327504a3b39cc533 -- cgit v1.2.3 From 1c1557aa93cd139688ebfe5a9922a60ef2b2d8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sat, 6 Jan 2018 20:24:01 +0200 Subject: Provisioning: Set CMake to PATH on Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ubuntu uses .profile file instead of .bashrc. We need to use the correct file accordingly. Task-number: QTBUG-65594 (cherry picked from commit 22e4664eb08dc5384c5afd0bd6c6a0725b242517) Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/cmake_linux.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index 35313d3c..3efe35a0 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +if uname -a |grep -q "Ubuntu"; then + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile +else + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +fi -- cgit v1.2.3 From 1540a875908f904226ad48fb41da5d49b498d177 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Jan 2018 23:22:28 +0100 Subject: Update submodules on '5.9' in qt5 Change-Id: I968ccd381929d89ef988d3ac2f468b25cbeb8365 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index c9edc164..855a19b4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c9edc164ab165ddd31ef2411be19deb130614e8b +Subproject commit 855a19b41237711037f85ae671d7999021b4cc4e diff --git a/qtbase b/qtbase index 5ba29e16..13c71ac8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5ba29e1672dafe16be004409661aef3a7ebf499a +Subproject commit 13c71ac816ce2f7fe864d6213b790a424d9a1664 diff --git a/qtdeclarative b/qtdeclarative index bbf3c471..ceba0c6b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bbf3c4715a1569b26a3aa029046e26989efd6edc +Subproject commit ceba0c6b9a0ac3b50f460572ba95bbbedbbaccae diff --git a/qtlocation b/qtlocation index 444e178a..7b8ab37b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 444e178a0779f1b0d28e2de1d4dc6a4b228c7a5d +Subproject commit 7b8ab37beaafbe27c258a6d80d1914f982dcc9e1 diff --git a/qtqa b/qtqa index eaf59453..1cf3a72d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit eaf59453eb1ea44fca63263dc25da473e624df6c +Subproject commit 1cf3a72de0bbd50bdfad0cd2cd21d430f1f6ebb9 diff --git a/qtrepotools b/qtrepotools index dbb2058c..d55c328b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit dbb2058c339bcf15db983c9597277864c157516f +Subproject commit d55c328b5bd5c02e5c9fe202d41fb30360f9f44a diff --git a/qttools b/qttools index e44c9c4f..e2a971c0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e44c9c4fc1f0fdb20aed13cc2adab3757b1d67f8 +Subproject commit e2a971c07422f70436930e71b80c12c5c4e313e1 -- cgit v1.2.3 From 113ad91c98efd500b9bc6cb52af25ed2b9b833e6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Jan 2018 10:11:59 +0100 Subject: Update submodules on '5.9.4' in qt5 Change-Id: I103ce41b4b7c576e36b43215401e83e43a0e522e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index c9edc164..02d01a68 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c9edc164ab165ddd31ef2411be19deb130614e8b +Subproject commit 02d01a68971747f01a270226f6474190736939cf diff --git a/qtbase b/qtbase index d5a11a0e..0c5953fd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d5a11a0ec206f6b9e7fd50b37717ca820d6ab98a +Subproject commit 0c5953fd4edbb8e6495aaf288186dbd6737fb8c0 diff --git a/qtconnectivity b/qtconnectivity index e46cde93..6eba2055 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e46cde935ee76eaa00e78af968121502e2406347 +Subproject commit 6eba2055ba2cf29ab8c2cbc8de10a1533b6404cc diff --git a/qtdeclarative b/qtdeclarative index 323f4886..2b8bc44a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 323f4886dcb99c419568802b96db88ddc9cba111 +Subproject commit 2b8bc44a88490d359b986ecfbf7c71d8216daa4c diff --git a/qtlocation b/qtlocation index 844e0e4a..a34e0874 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 844e0e4aec3285ec5cfde90422acd796bc4d7d39 +Subproject commit a34e08740d55b606bbaa4963a3ba9887459fd8ce diff --git a/qtqa b/qtqa index eaf59453..1cf3a72d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit eaf59453eb1ea44fca63263dc25da473e624df6c +Subproject commit 1cf3a72de0bbd50bdfad0cd2cd21d430f1f6ebb9 diff --git a/qtrepotools b/qtrepotools index 07f8dbb0..d55c328b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 07f8dbb095e4905d2d43e1527ce5616d047a3ae9 +Subproject commit d55c328b5bd5c02e5c9fe202d41fb30360f9f44a diff --git a/qttools b/qttools index 2f3dc790..98f8f497 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2f3dc790aefadc74debfa25efe958078def34146 +Subproject commit 98f8f4971e6c2ffcb0ac5793ffe834197ab034ab diff --git a/qtwayland b/qtwayland index 70fc4900..583ce658 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 70fc4900ee70e786b615e1f31201564b946fd0ac +Subproject commit 583ce658c38700b22d93329634d676b288118da4 diff --git a/qtwebengine b/qtwebengine index 6f242a93..8a1f674f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6f242a9389369242b23a61dcb59fc610dc27bb05 +Subproject commit 8a1f674f9a811ed23302c9f9a2098f4c699cbfb9 -- cgit v1.2.3 From d1aeb5c5691d4500377048c1540ff9132bdb495b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Jan 2018 00:06:44 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I0e7cb3a46909c3b72e2639b9ef2214428bd02cb6 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 855a19b4..907869e8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 855a19b41237711037f85ae671d7999021b4cc4e +Subproject commit 907869e8f87bab55671bfabf29f773cc01f40b68 diff --git a/qtbase b/qtbase index 13c71ac8..99b89d30 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 13c71ac816ce2f7fe864d6213b790a424d9a1664 +Subproject commit 99b89d30fa5484c5d1f3cbda828648c28af4fb7d diff --git a/qtconnectivity b/qtconnectivity index caad6365..20d21839 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit caad6365b291cc5066ff5aaacdc1b6e02818bc10 +Subproject commit 20d21839e26b2d517e8e5d3dab9d86c5d338d414 diff --git a/qtdeclarative b/qtdeclarative index ceba0c6b..4e027766 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ceba0c6b9a0ac3b50f460572ba95bbbedbbaccae +Subproject commit 4e0277664071c31e2189e2351e3e9d12c4e7e08c diff --git a/qtlocation b/qtlocation index 7b8ab37b..17c494dc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7b8ab37beaafbe27c258a6d80d1914f982dcc9e1 +Subproject commit 17c494dcd248c32891da940ef68b1e6b520175b8 diff --git a/qtmultimedia b/qtmultimedia index b9440a30..d58b6b90 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b9440a3047cfca9ae253e850db31b8e9b08538e7 +Subproject commit d58b6b908ea130e9422b08b5b3b460b48da7d337 diff --git a/qtquickcontrols b/qtquickcontrols index 5f0bd47f..38414f92 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5f0bd47f81469407023bc9b05b13cdf1834d50b3 +Subproject commit 38414f9262aebe9e77dcb181a1672d2e929fbb48 diff --git a/qtwayland b/qtwayland index ec029b1a..bf09c7a1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ec029b1a4c104c2400da23d4f5f04d7f03731beb +Subproject commit bf09c7a1493c01a65ee0f110b37a04e653edc08e diff --git a/qtwebengine b/qtwebengine index 26ffb70f..685ce77c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 26ffb70f5748e0e7340d88681f2841ae246a8e7e +Subproject commit 685ce77cb6c696fb062ff4ab967b6ae553821a2d -- cgit v1.2.3 From 6a875b9f81ee6dfaadde0d61ba6e7f8637d67668 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 16 Jan 2018 13:54:12 +0100 Subject: Fix checksum for QNX 7 SDK download Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 18ce0581..a7a8c035 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -38,7 +38,7 @@ $zip = "c:\users\qt\downloads\qnx700.7z" Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip -Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb" +Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" Extract-7Zip $zip C:\ [Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine") -- cgit v1.2.3 From 8aec4db6a63582da523332627273c14cf22e0db5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Jan 2018 20:32:19 +0100 Subject: Update submodules on '5.9.4' in qt5 Change-Id: I21728a4b47373450defe1a90bd9bcf4680f323af Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 0c5953fd..0d9208ce 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0c5953fd4edbb8e6495aaf288186dbd6737fb8c0 +Subproject commit 0d9208cecbbd9ed08e4ffb6540729668e3bd7754 diff --git a/qtdatavis3d b/qtdatavis3d index 4cd89b61..66315056 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4cd89b61be205fc52ce1b227fe55e4de04196db7 +Subproject commit 66315056141a6c51329f66cdabb9bf1f83f6f918 diff --git a/qtdeclarative b/qtdeclarative index 2b8bc44a..317908e7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2b8bc44a88490d359b986ecfbf7c71d8216daa4c +Subproject commit 317908e72a6ea0b4ca179690539cb352bbf60832 diff --git a/qtmultimedia b/qtmultimedia index d405f875..d83467be 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d405f87569b47d8e420f7bc6aee04f477663c92e +Subproject commit d83467be15486090ee23709dc325c2c28d34c0cd diff --git a/qtserialbus b/qtserialbus index 1b263f6a..6e3e86f9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1b263f6a56c14e04e92310998303d8f815dba8f8 +Subproject commit 6e3e86f947fcbdf19cfad5d9cc6407f3a9e3f51e diff --git a/qtwayland b/qtwayland index 583ce658..83db09bd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 583ce658c38700b22d93329634d676b288118da4 +Subproject commit 83db09bd0acaafb256880e3a217ed9df0641a00a diff --git a/qtwebengine b/qtwebengine index 8a1f674f..a86ac3eb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8a1f674f9a811ed23302c9f9a2098f4c699cbfb9 +Subproject commit a86ac3eb0a917766897284a6404ada00bf327629 -- cgit v1.2.3 From 2348ead5295079a9ddcde4d339e016f7c3d58b6d Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 17 Jan 2018 07:18:46 +0000 Subject: Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries" Now debug symbols are added in qtlibs as well and library size is huge. We need additional 'separate_debug_info' flag in addition to this but currently there isn't support for it in coin. That's why we need to revert this change until coin has full support for this. This reverts commit b0b6b05b34f7d24c3a762e9b383c1b5bd1153a04. Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f Reviewed-by: Eike Ziller Reviewed-by: Iikka Eklund --- 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 805b32e9..c3af6b5d 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -- cgit v1.2.3 From b1198d34020f2aa291943ac5ee2a7a1eb19dbaf3 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 18 Jan 2018 11:37:57 +0100 Subject: Fix provisioning: Wait for msvc-2013 update 5 to finish MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)... Removing C:\Windows\Temp\vs12-kb2829760.exe ... Caught System.UnauthorizedAccessException Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied. Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 index 202d072d..447e7b1f 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 @@ -40,10 +40,9 @@ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe" echo "Fetching patch for Visual Studio $version..." Copy-Item $url_cache $package -$commandLine = $package echo "Installing Update 5 for Visual Studio $version..." -. $commandLine /norestart /passive +Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait echo "Removing $package ..." remove-item $package -- cgit v1.2.3 From b86b3a757b473e86aae7f246d2f1a8e0ae8e54b7 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 17 Jan 2018 17:56:20 +0100 Subject: Fix provisioning: NotePad++ path on 64 bit windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We install the 64 bit version of np++ which is installed in the regular program files folder. Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61 Reviewed-by: Tony Sarajärvi Reviewed-by: Oliver Wolff --- coin/provisioning/common/windows/install-notepad++.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/coin/provisioning/common/windows/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1 index a6e20d5e..4fad6f6d 100644 --- a/coin/provisioning/common/windows/install-notepad++.ps1 +++ b/coin/provisioning/common/windows/install-notepad++.ps1 @@ -57,11 +57,6 @@ Remove-Item -Recurse -Force "$nppPackage" echo "Notepad++ = $version" >> ~\versions.txt -if( (is64bitWinHost) -eq 1 ) { - Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" -} -else { - Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" -} +Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" echo "Auto-updating disabled." -- cgit v1.2.3 From 99595f44f1b3a3c35d8decc671a8933f65220cf3 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 17 Jan 2018 15:57:27 +0100 Subject: Provisioning: Fix disabling windows updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On some machines the updates were already disabled, which lead to the call to disable the service failing. Now we just move on without error. Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3 Reviewed-by: Frederik Gladhorn Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-windows-updates.ps1 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1 index 1a014733..05215e20 100644 --- a/coin/provisioning/common/windows/disable-windows-updates.ps1 +++ b/coin/provisioning/common/windows/disable-windows-updates.ps1 @@ -33,5 +33,22 @@ # This script disables the automatic Windows updates -stop-service wuauserv -set-service wuauserv –startup disabled +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} + +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + stop-service wuauserv +} + +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} -- cgit v1.2.3 From 31a0826fe8cf56bb7c24ee615eecea7c6a393cba Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Jan 2018 23:43:20 +0100 Subject: Update submodules on '5.9' in qt5 Change-Id: I48a99c5161698f833ab0f0798690e5fa963057d5 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qt3d b/qt3d index 907869e8..387dde19 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 907869e8f87bab55671bfabf29f773cc01f40b68 +Subproject commit 387dde19d2cfc349d8fe9b5775078798d99fc144 diff --git a/qtandroidextras b/qtandroidextras index cb2fa645..cd6fc729 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit cb2fa645bef1a0c05065fe43a038e5bf962e095b +Subproject commit cd6fc729f32ed01ec52b7aad4be463c8161240bf diff --git a/qtbase b/qtbase index 99b89d30..957c1d9a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 99b89d30fa5484c5d1f3cbda828648c28af4fb7d +Subproject commit 957c1d9abd854a3b5c43ace807ab7cbf89c91491 diff --git a/qtcanvas3d b/qtcanvas3d index 25f6b209..e8c0f4eb 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 25f6b209a64a3c7e16e1c4655a970aaf5f4341cc +Subproject commit e8c0f4eb3e3ffebad02eee7b6bfecf0a3c573f1d diff --git a/qtcharts b/qtcharts index ad9d59e8..a2eb6b3b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ad9d59e871b6f1a7b3f0b0ae1248ffa205647993 +Subproject commit a2eb6b3b15e19d5c8215c41694ce8c74918cb58a diff --git a/qtconnectivity b/qtconnectivity index 20d21839..8cece5f6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 20d21839e26b2d517e8e5d3dab9d86c5d338d414 +Subproject commit 8cece5f6e09010de4bebd1a2ef524e2ca55d8a5b diff --git a/qtdatavis3d b/qtdatavis3d index 4cd89b61..172dbad2 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4cd89b61be205fc52ce1b227fe55e4de04196db7 +Subproject commit 172dbad2db094148323fd8a9e6ab44c72a9fa88e diff --git a/qtdeclarative b/qtdeclarative index 4e027766..706a6647 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4e0277664071c31e2189e2351e3e9d12c4e7e08c +Subproject commit 706a6647db695cdeb854ef1bf956ded56b498f78 diff --git a/qtdoc b/qtdoc index a83a49af..efb7c673 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a83a49aff24964803ddee737bd3b172ce3003290 +Subproject commit efb7c673cda85f7de1941e4fbf8e6cc4ad290a2d diff --git a/qtgamepad b/qtgamepad index 7eaac052..d252eb8a 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 7eaac052282038dc9a05afe7b48fa4676f6876b5 +Subproject commit d252eb8ae4f99a5ad193662a493aa17044aef434 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 9b6d754d..ddee9ff8 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 9b6d754d192ae53306b8fe6277b0bbe84bde53d6 +Subproject commit ddee9ff8217d307b962c033ea632bfe3ef683acc diff --git a/qtlocation b/qtlocation index 17c494dc..765ec408 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 17c494dcd248c32891da940ef68b1e6b520175b8 +Subproject commit 765ec408b3b355b37c04f52dc6c477e3dca3e3f8 diff --git a/qtmacextras b/qtmacextras index 26ce599c..5e0178d3 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 26ce599c8ffdae9b001ec9dc7d5639ff0b528066 +Subproject commit 5e0178d350c3f59fe327b5a5c89beb4f48efca2f diff --git a/qtmultimedia b/qtmultimedia index d58b6b90..7638848d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d58b6b908ea130e9422b08b5b3b460b48da7d337 +Subproject commit 7638848d2486e2fac9764b60a99de08f50adc8eb diff --git a/qtpurchasing b/qtpurchasing index acdce943..34796716 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit acdce9431b5ead5754e149853839569ffbd9e200 +Subproject commit 3479671699f5a6cb13e002762dc35398b66066fd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d61567f3..d64774ad 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d61567f3cfa100aeab865bd6b436de87970575f5 +Subproject commit d64774add9fafa24406a202d0313e10780e1e715 diff --git a/qtscxml b/qtscxml index 866816d5..86983e53 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 866816d57204dc60bb9d0a8b5157c4cf7addd214 +Subproject commit 86983e533aec1cf1095fec643dc6b1b9029fd456 diff --git a/qtsensors b/qtsensors index e2a5bf08..01186d63 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e2a5bf08c4d9239ff1da88b4d35e9bb89133a940 +Subproject commit 01186d63a0e585d6eb432271371dd3cd489dc905 diff --git a/qtserialbus b/qtserialbus index 1b263f6a..81b1ae51 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1b263f6a56c14e04e92310998303d8f815dba8f8 +Subproject commit 81b1ae518792a9c1a2417c3a05b87eb5dc7ebc13 diff --git a/qtserialport b/qtserialport index 7c5eb346..c0bdb69f 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7c5eb346f1ee0241522babba053974a17e2250cd +Subproject commit c0bdb69f432117e9119866bd610aea87d3eb4ee1 diff --git a/qtsvg b/qtsvg index 808ae358..74eb2d7d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 808ae3589a031413e25d7b6e66f2e966cefacb96 +Subproject commit 74eb2d7d0268492c95779cb6029393aa1de67e05 diff --git a/qttools b/qttools index e2a971c0..47689d48 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e2a971c07422f70436930e71b80c12c5c4e313e1 +Subproject commit 47689d484a6254c2eef3ee382ea5e2775a020c0f diff --git a/qtwayland b/qtwayland index bf09c7a1..6793a0a9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bf09c7a1493c01a65ee0f110b37a04e653edc08e +Subproject commit 6793a0a907f3aa92f8f8bd5448505c152d0e3a3d diff --git a/qtwebchannel b/qtwebchannel index 6701ff31..97d2deb5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6701ff310933ec33f9199b53d78299764f646387 +Subproject commit 97d2deb55b854fd2b97efc0a5b41da28444c6e78 diff --git a/qtwebengine b/qtwebengine index 685ce77c..04337275 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 685ce77cb6c696fb062ff4ab967b6ae553821a2d +Subproject commit 04337275e4b66ba5853c24a79d7f61ebb2e7a247 diff --git a/qtwebsockets b/qtwebsockets index bd08a6ba..78607d65 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bd08a6ba75ed04089fb2fa3e763ade8ebc1ef9da +Subproject commit 78607d656e18717e2edb5e0430e7eeefaf24fa8b diff --git a/qtwebview b/qtwebview index a14f37e7..f016c778 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a14f37e76b429876015ee96cc4adb97ed4c9fbed +Subproject commit f016c7781fb418fd57bae62d22ce46f8711de62a diff --git a/qtwinextras b/qtwinextras index 13042633..d4985a34 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 130426337da1703ed3c0d9d84f4ccbd96c561336 +Subproject commit d4985a348ccb2e3b83d64dbc95f5f2bab83e9bc6 diff --git a/qtxmlpatterns b/qtxmlpatterns index 81dd1238..c3ef9c68 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 81dd12388d67f6b2be253ea831b876c8dec2dca5 +Subproject commit c3ef9c68cefc4fd323e34f1dcf0314d385a70e23 -- cgit v1.2.3 From 786be66eaf2bf35c75ca534930cbc87c52634e8d Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 10 Jan 2018 10:02:32 +0200 Subject: Move exception throw to the correct line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This throw was placed on the echo line instead of the actual command. Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59 Reviewed-by: Konstantin Tokarev Reviewed-by: Edward Welbourne Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 60e637b7..5d36f57b 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 @@ -52,8 +52,8 @@ ExceptionProxy=104 try ( - echo "Set timezone to UTC" || throw $ExceptionTimezone - sudo timedatectl set-timezone Etc/UTC + echo "Set timezone to UTC." + sudo timedatectl set-timezone Etc/UTC || throw $ExceptionTimezone echo "Timeout for blanking the screen (0 = never)" gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1 echo "Prevents screen lock when screesaver goes active." -- cgit v1.2.3