From c1fcf7c1ad06c440988c9456ffdd9cffdc8b7d39 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 10 Jul 2018 08:37:04 +0200 Subject: [PATCH 01/21] init-repo: Allow sub-module checkout path to differ from config name Change-Id: I622a8ed5daee59a96f4c6c28cc8c5e4d20b88f58 Reviewed-by: Oswald Buddenhagen Reviewed-by: Edward Welbourne --- init-repository | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 875aec2b..026ac987 100755 --- a/init-repository +++ b/init-repository @@ -414,7 +414,8 @@ sub git_clone_all_submodules my $branch = $subbranches{$module}; die("No branch defined for submodule $module.\n") if (!defined($branch)); my $orig_cwd = getcwd(); - chdir($module) or confess "chdir $module: $OS_ERROR"; + my $module_dir = $subdirs{$module}; + chdir($module_dir) or confess "chdir $module_dir: $OS_ERROR"; my $br = qx(git rev-parse -q --verify $branch); if (!$br) { $self->exe('git', 'checkout', '-b', $branch, "origin/$branch"); From 743843bddbb020a193a78f768f35a48090c15b2a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Jul 2018 04:31:59 +0300 Subject: [PATCH 02/21] Update submodules on '5.11' in qt5 Change-Id: Iac05412210fa6030234b450d87d5b15543fdbbb5 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtxmlpatterns | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index 895cd926..c39e20dc 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 895cd926ba6d420e72a7d2ae2bb0624ab7aeb791 +Subproject commit c39e20dcc693b525f2ee2259e864487d664c3856 diff --git a/qtandroidextras b/qtandroidextras index 8ad2c8e6..ab234ad6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 8ad2c8e62a71551495d4c0d5dfae148a6009d027 +Subproject commit ab234ad62ac530b9e12482f0d98c189bee4afee3 diff --git a/qtbase b/qtbase index 85913b4a..1d334939 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 85913b4afcee5ff0b0fa7d375ae735615b03b53d +Subproject commit 1d33493989eae774bafc124f9d3ee68d7a017a10 diff --git a/qtconnectivity b/qtconnectivity index 9b7a4c10..21981b8f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9b7a4c10b67dd7d89ed30f1f94d8982dab47ded0 +Subproject commit 21981b8ff96d5a5b5685ab33bb22959c3b584aaf diff --git a/qtdeclarative b/qtdeclarative index 44e4f8b3..36999863 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 44e4f8b360367bc846f1d9cbe55876466fea4356 +Subproject commit 369998639b37b5de46ab1b19b3dd6ca6c2b77d34 diff --git a/qtdoc b/qtdoc index e9f4b5e0..a75c99b2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e9f4b5e081d6c985d718916bc504c6b1f1a1d93c +Subproject commit a75c99b2bdf45702a3ff30996475a34a8fd7172b diff --git a/qtlocation b/qtlocation index ec8152a9..abcb5d1b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ec8152a98b8971af6020dbee5a2885a525a53f88 +Subproject commit abcb5d1bccbc5913b7d994e0ad2685d484c35740 diff --git a/qtmultimedia b/qtmultimedia index 135c762e..4e080dcb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 135c762ea0bb2c13f9568b9c85b10633f0c6ce34 +Subproject commit 4e080dcbfc8b519b041f125c53ad5f7313ac5393 diff --git a/qtnetworkauth b/qtnetworkauth index 55b80f9e..f2344584 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 55b80f9e7b0a81cf6c80ae0a381a20641194c09e +Subproject commit f23445845310b9f47ea5592f1dea92ca463ba284 diff --git a/qtqa b/qtqa index 82a3dfd8..c84cbdac 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 82a3dfd8a6cda7d30389af92163e82e1d34fae73 +Subproject commit c84cbdac40c1357f561a98f28b9d9d4adc787927 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1b94294a..449c9c24 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1b94294a34150a051f78b97278047a8ed173213c +Subproject commit 449c9c2474da0461c14e7d6ea12ff4e35c3c7aae diff --git a/qttools b/qttools index 4ec82667..41342fac 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4ec82667f632992e827299c96d3bfd2b221a029b +Subproject commit 41342facfa10a6a69ec6e23e629975cd0263e39e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f71bd186..0a930720 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f71bd1863a1f29f4f19d5be05bc0f422e5cbffb0 +Subproject commit 0a93072035e7fc3fdc616674a18e1bb8e3dcdd89 diff --git a/qtwayland b/qtwayland index 4d5af47c..25a089b2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4d5af47cd679ef760c4522f731169da08f577483 +Subproject commit 25a089b24844579f3623443182465f2d6f41da3a diff --git a/qtwebengine b/qtwebengine index 730e74c1..f055da31 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 730e74c1da6cac774c4d7d861559ea37d845913e +Subproject commit f055da31fb011e852345665fceb6933fa966f731 diff --git a/qtwebglplugin b/qtwebglplugin index bdbbafb0..10f1effd 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bdbbafb0f842530757c4e1a13072e0d3a514d1cb +Subproject commit 10f1effdc1c776c24b5314024aa3d04752dd2dfe diff --git a/qtxmlpatterns b/qtxmlpatterns index df2fb4bb..3b5a20dc 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit df2fb4bbe406ffa080f2ada087822cf74aa2bd81 +Subproject commit 3b5a20dc02bd00032a19c2951bfa940e6d83aca0 From 9cd9258b8bc3d0d09c3ba34f6f4fb2c70924720c Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 22 Jun 2018 09:45:32 +0200 Subject: [PATCH 03/21] Move _clang-format from qtrepotools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9ccacaf6ed09bbc0ee3f55bf6f97d96976341d14 Reviewed-by: Tor Arne Vestbø Reviewed-by: Paul Wicking Reviewed-by: Kai Koehne Reviewed-by: Allan Sandfeld Jensen --- _clang-format | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 _clang-format diff --git a/_clang-format b/_clang-format new file mode 100644 index 00000000..c2e09757 --- /dev/null +++ b/_clang-format @@ -0,0 +1,80 @@ +# Copyright (C) 2016 Olivier Goffart +# +# You may use this file under the terms of the 3-clause BSD license. +# See the file LICENSE from this package for details. + +# This is the clang-format configuration style to be used by Qt, +# based on the rules from https://wiki.qt.io/Qt_Coding_Style and +# https://wiki.qt.io/Coding_Conventions + +--- +# Webkit style was loosely based on the Qt style +BasedOnStyle: WebKit + +Standard: Cpp11 + +# Leave the line breaks up to the user. +# Note that this may be changed at some point in the future. +ColumnLimit: 0 +# How much weight do extra characters after the line length limit have. +# PenaltyExcessCharacter: 4 + +# Disable reflow of qdoc comments: indentation rules are different. +# Translation comments are also excluded. +CommentPragmas: "^!|^:" + +# We want a space between the type and the star for pointer types. +PointerBindsToType: false + +# We use template< without space. +SpaceAfterTemplateKeyword: false + +# We want to break before the operators, but not before a '='. +BreakBeforeBinaryOperators: NonAssignment + +# Braces are usually attached, but not after functions or class declarations. +BreakBeforeBraces: Custom +BraceWrapping: + AfterClass: true + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false + +# When constructor initializers do not fit on one line, put them each on a new line. +ConstructorInitializerAllOnOneLineOrOnePerLine: true +# Indent initializers by 8 spaces +ConstructorInitializerIndentWidth: 8 + +# Indent width for line continuations. +ContinuationIndentWidth: 8 + +# No indentation for namespaces. +NamespaceIndentation: None + +# Horizontally align arguments after an open bracket. +# The coding style does not specify the following, but this is what gives +# results closest to the existing code. +AlignAfterOpenBracket: true +AlwaysBreakTemplateDeclarations: true + +# Ideally we should also allow less short function in a single line, but +# clang-format does not handle that. +AllowShortFunctionsOnASingleLine: Inline + +# The coding style specifies some include order categories, but also tells to +# separate categories with an empty line. It does not specify the order within +# the categories. Since the SortInclude feature of clang-format does not +# re-order includes separated by empty lines, the feature is not used. +SortIncludes: false + +# macros for which the opening brace stays attached. +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] + + From 78a597f9874f9f8f81392e55d882cc53925e0c1b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 20 Jul 2018 04:32:01 +0300 Subject: [PATCH 04/21] Update submodules on '5.11' in qt5 Change-Id: I27d4627770309abe7a9393e411c82e7ea414b766 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index c39e20dc..cdf92a8b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c39e20dcc693b525f2ee2259e864487d664c3856 +Subproject commit cdf92a8ba06c3df17a11c8931d540a4bf9229f61 diff --git a/qtbase b/qtbase index 1d334939..f17d33be 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1d33493989eae774bafc124f9d3ee68d7a017a10 +Subproject commit f17d33bebbb2d19abf725c20ee81a2dbe8658c9e diff --git a/qtdeclarative b/qtdeclarative index 36999863..785b12a4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 369998639b37b5de46ab1b19b3dd6ca6c2b77d34 +Subproject commit 785b12a4d126b8aaac6c378d06a5c885aa5441a7 diff --git a/qtdoc b/qtdoc index a75c99b2..3cbf991a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a75c99b2bdf45702a3ff30996475a34a8fd7172b +Subproject commit 3cbf991a9bec70b31aabbfa7b13ef52f3b9638ec diff --git a/qtqa b/qtqa index c84cbdac..f97b9826 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c84cbdac40c1357f561a98f28b9d9d4adc787927 +Subproject commit f97b982683a908cd39afc68ea239de50e9248dd1 diff --git a/qttools b/qttools index 41342fac..3ecb48a2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 41342facfa10a6a69ec6e23e629975cd0263e39e +Subproject commit 3ecb48a25ae72c918c6d8c4486254aeb418e4828 diff --git a/qtwebengine b/qtwebengine index f055da31..2d3afea3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f055da31fb011e852345665fceb6933fa966f731 +Subproject commit 2d3afea3c0a1d56b62fbd28d0a49a64c06857eb1 diff --git a/qtx11extras b/qtx11extras index b0fa7026..35645ce8 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit b0fa702623fc8ed600c1c285a3fa5b80d29b5c0c +Subproject commit 35645ce85bd0d48e8fd74b59898394e678ce1655 From 5e45a7a26e500532a4b2f77c716880241f5dd2c4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 Jul 2018 04:32:25 +0300 Subject: [PATCH 05/21] Update submodules on '5.11' in qt5 Change-Id: I1532481ce8b85e25058b580308c44f531141f1a3 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index cdf92a8b..9e20a1d5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cdf92a8ba06c3df17a11c8931d540a4bf9229f61 +Subproject commit 9e20a1d578a44c6bdb98a9aacd7daf7aaf166e3e diff --git a/qtbase b/qtbase index f17d33be..6bc6e6d3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f17d33bebbb2d19abf725c20ee81a2dbe8658c9e +Subproject commit 6bc6e6d38859c39dd3def31126cff69259785a0d diff --git a/qtdoc b/qtdoc index 3cbf991a..3ac45649 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3cbf991a9bec70b31aabbfa7b13ef52f3b9638ec +Subproject commit 3ac456496b51d551e6e91feec49d2a422a43cc42 diff --git a/qtwebengine b/qtwebengine index 2d3afea3..10376cbe 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2d3afea3c0a1d56b62fbd28d0a49a64c06857eb1 +Subproject commit 10376cbe5d653f1fd1a5554e00d288eaf3e94a78 From 34e0a5614459b355076c0bceb46f719dcf5394e8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Jul 2018 04:31:47 +0300 Subject: [PATCH 06/21] Update submodules on '5.11' in qt5 Change-Id: I681548a12fec32f415694bc6a397a202c876e8e8 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 6bc6e6d3..fc17a02c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6bc6e6d38859c39dd3def31126cff69259785a0d +Subproject commit fc17a02c04f19f4d7a0ba6f0bf1a57ec6ca80230 diff --git a/qtdeclarative b/qtdeclarative index 785b12a4..0602e657 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 785b12a4d126b8aaac6c378d06a5c885aa5441a7 +Subproject commit 0602e657fac200b0fc7d3ae19361ef9ef1247d92 From 11851f418beb3ac02fb261410346b27b7f6a193e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Jul 2018 04:32:24 +0300 Subject: [PATCH 07/21] Update submodules on '5.11' in qt5 Change-Id: Ie65a8302aa83a5c7c83c5c4ca2debcb9fe116e3c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtpurchasing | 2 +- qtscript | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index fc17a02c..3bc0f172 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc17a02c04f19f4d7a0ba6f0bf1a57ec6ca80230 +Subproject commit 3bc0f1724ae49c2fd7e6d7bcb650350d20d12246 diff --git a/qtconnectivity b/qtconnectivity index 21981b8f..150297f4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 21981b8ff96d5a5b5685ab33bb22959c3b584aaf +Subproject commit 150297f4884437ae22b03ed464313cd4d33088c1 diff --git a/qtpurchasing b/qtpurchasing index 44a9a2a2..54adaada 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 44a9a2a2f061660ac61cad4b47c7301c63135e88 +Subproject commit 54adaada25f2d8b44f9f15dc6e1b77e73f3cbdd3 diff --git a/qtscript b/qtscript index 1d229473..a951c3cf 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 1d2294735536c53fca8e56ed4b262c4bca6b4d29 +Subproject commit a951c3cf75fe1da3148b12f2aff2853b4d368909 diff --git a/qtwebengine b/qtwebengine index 10376cbe..4097c534 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 10376cbe5d653f1fd1a5554e00d288eaf3e94a78 +Subproject commit 4097c53421c6aed90c5e78f974c1d2ab4fdf339f From c00bed4a4268b127b00152205110eeec2fa1a48b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 25 Jul 2018 04:33:38 +0300 Subject: [PATCH 08/21] Update submodules on '5.11' in qt5 Change-Id: I77c1b4607fc857de5c9ee9abfa8e81f4bc8f0e0a Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 3bc0f172..708fa860 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3bc0f1724ae49c2fd7e6d7bcb650350d20d12246 +Subproject commit 708fa860bc877995256f08cd55bf1421d510e5f3 diff --git a/qtdeclarative b/qtdeclarative index 0602e657..6c7c40b4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0602e657fac200b0fc7d3ae19361ef9ef1247d92 +Subproject commit 6c7c40b42240597d4d8c5fd993355c7a5ea1b11d diff --git a/qtdoc b/qtdoc index 3ac45649..0fd9a726 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3ac456496b51d551e6e91feec49d2a422a43cc42 +Subproject commit 0fd9a72624901090324ba5ccebe5221d9437fcfb diff --git a/qtmultimedia b/qtmultimedia index 4e080dcb..448c9929 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e080dcbfc8b519b041f125c53ad5f7313ac5393 +Subproject commit 448c992972d4078af1eee7ad9ccc8d86c0f2e78d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 449c9c24..4e11d09f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 449c9c2474da0461c14e7d6ea12ff4e35c3c7aae +Subproject commit 4e11d09fdef369af130c86a81df599ee3273ac7d diff --git a/qttools b/qttools index 3ecb48a2..ed6d2d42 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3ecb48a25ae72c918c6d8c4486254aeb418e4828 +Subproject commit ed6d2d42973b62271fd8de54db39ea8cf63e3d01 From dc406ec87eee0eea0762422e2752987f55bd90ad Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Jul 2018 04:33:41 +0300 Subject: [PATCH 09/21] Update submodules on '5.11' in qt5 Change-Id: I7ad748481565042891e28dc17385e8229ea18c73 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 708fa860..9a04453b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 708fa860bc877995256f08cd55bf1421d510e5f3 +Subproject commit 9a04453b50ea22d6060aeb49250cf3e263d86ad3 diff --git a/qtdeclarative b/qtdeclarative index 6c7c40b4..afccf3b4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6c7c40b42240597d4d8c5fd993355c7a5ea1b11d +Subproject commit afccf3b4654c04c57d4f7e6da09f88e27ffb5a54 diff --git a/qtmultimedia b/qtmultimedia index 448c9929..5488653c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 448c992972d4078af1eee7ad9ccc8d86c0f2e78d +Subproject commit 5488653cf82ad4ed94be4167a6281356b678928d diff --git a/qtwebengine b/qtwebengine index 4097c534..d603b705 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4097c53421c6aed90c5e78f974c1d2ab4fdf339f +Subproject commit d603b705539e1ec0d93761707d7df6d07bced98a From fc44b4385184a547389f42d6cec8a8384c5d1650 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 29 Jul 2018 04:32:34 +0300 Subject: [PATCH 10/21] Update submodules on '5.11' in qt5 Change-Id: I620723f0983da8a0bf8e19348a6a0be2d02c1341 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 9a04453b..ce4407c3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9a04453b50ea22d6060aeb49250cf3e263d86ad3 +Subproject commit ce4407c32749e9d22314c09aa205691dbad2a335 diff --git a/qtconnectivity b/qtconnectivity index 150297f4..2ce6a935 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 150297f4884437ae22b03ed464313cd4d33088c1 +Subproject commit 2ce6a9350bc1f1a2fd8edfc1f3161131bd15e5dc diff --git a/qtdeclarative b/qtdeclarative index afccf3b4..1d815780 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit afccf3b4654c04c57d4f7e6da09f88e27ffb5a54 +Subproject commit 1d815780e020a7315dfc4762b6b0280834203e7e diff --git a/qtlocation b/qtlocation index abcb5d1b..e079d8d8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit abcb5d1bccbc5913b7d994e0ad2685d484c35740 +Subproject commit e079d8d8d8cd4f9e4bd85abdf39804075e34517b diff --git a/qtqa b/qtqa index f97b9826..4132995e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f97b982683a908cd39afc68ea239de50e9248dd1 +Subproject commit 4132995e596add89465950d33aa95ce7f6e25e83 diff --git a/qttools b/qttools index ed6d2d42..57d008ad 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ed6d2d42973b62271fd8de54db39ea8cf63e3d01 +Subproject commit 57d008adf719a5542375bdf7a4b8ca55a7d5bedb diff --git a/qtwebengine b/qtwebengine index d603b705..c56169f7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d603b705539e1ec0d93761707d7df6d07bced98a +Subproject commit c56169f7a1bcbe45f3c89a78b8a5a4606666db83 From f128708e34e3144f4ebb6623ff508cbf2c18ce0b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 31 Jul 2018 04:32:55 +0300 Subject: [PATCH 11/21] Update submodules on '5.11' in qt5 Change-Id: Ie6ec2358ba3df679b0d7bc30f9c17935fc19993b Reviewed-by: Qt Submodule Update Bot --- 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 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 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 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 9e20a1d5..ef2b1fe0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9e20a1d578a44c6bdb98a9aacd7daf7aaf166e3e +Subproject commit ef2b1fe00f881af7168e2fd8746d2270ec43b11c diff --git a/qtactiveqt b/qtactiveqt index 0c466312..e977cfd5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0c46631233f7d9a0c445ee648818db910f68915b +Subproject commit e977cfd5d9d3eddca7c7daba29e54899fd77133b diff --git a/qtandroidextras b/qtandroidextras index ab234ad6..82fc3412 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ab234ad62ac530b9e12482f0d98c189bee4afee3 +Subproject commit 82fc3412c648d17ce99aecf7b46b273f72a4dbda diff --git a/qtbase b/qtbase index ce4407c3..0ef66e98 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ce4407c32749e9d22314c09aa205691dbad2a335 +Subproject commit 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e diff --git a/qtcanvas3d b/qtcanvas3d index 43f3a363..c8ca99e2 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 43f3a363133a93e2c6e465d149476a18f3a5d4e5 +Subproject commit c8ca99e24e6ec57d961050ebe31da2109208c720 diff --git a/qtcharts b/qtcharts index 85df7a64..cf3255b1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 85df7a646759b6504de463692e144016a47e183e +Subproject commit cf3255b18b488c7bb1802a9447f7b0ed0a2a4434 diff --git a/qtconnectivity b/qtconnectivity index 2ce6a935..9b48eeaa 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2ce6a9350bc1f1a2fd8edfc1f3161131bd15e5dc +Subproject commit 9b48eeaa970926a60a886cadd54414f659a0af18 diff --git a/qtdatavis3d b/qtdatavis3d index 4d2d9a85..d4ef709d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4d2d9a85932e960e39396b375a7842756c8415fe +Subproject commit d4ef709d16b6a22ee024069c19aba2a9311f8f9d diff --git a/qtdeclarative b/qtdeclarative index 1d815780..a5dff730 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1d815780e020a7315dfc4762b6b0280834203e7e +Subproject commit a5dff7302cea62f3cfe3235cf64c359b2464d126 diff --git a/qtdoc b/qtdoc index 0fd9a726..c4b4982c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0fd9a72624901090324ba5ccebe5221d9437fcfb +Subproject commit c4b4982cf82494fe9664a2d200ef29d5e5e5cdb3 diff --git a/qtgamepad b/qtgamepad index 8f7dea83..98ea3cf1 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8f7dea835e63cd78648090fbc19ad7cb23ac642c +Subproject commit 98ea3cf16e978efb9d3dc7c8708dfa739a796ba9 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a67f916c..76191bb1 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a67f916c317c9d9fa57f222a6dfe140b928935a7 +Subproject commit 76191bb1df602aa4a2bf99a3a0b21bb081a52693 diff --git a/qtimageformats b/qtimageformats index 177c85c5..55904e96 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 177c85c58db23aad28a7445956cab7f062caaa94 +Subproject commit 55904e9671f4e927308a78d217c0069528ba7f49 diff --git a/qtlocation b/qtlocation index e079d8d8..a8c09973 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e079d8d8d8cd4f9e4bd85abdf39804075e34517b +Subproject commit a8c09973f8cc960b9047157ad7e6834032bea0b7 diff --git a/qtmacextras b/qtmacextras index a0e7b29d..169bc0d4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a0e7b29d59161479748204e3b3fe8f11903d93f6 +Subproject commit 169bc0d4531bca679007fabf416ccceeb39d4450 diff --git a/qtmultimedia b/qtmultimedia index 5488653c..7936c055 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5488653cf82ad4ed94be4167a6281356b678928d +Subproject commit 7936c055b6becd8e291a93c1d9955a0f460e2d6c diff --git a/qtnetworkauth b/qtnetworkauth index f2344584..c47f2735 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f23445845310b9f47ea5592f1dea92ca463ba284 +Subproject commit c47f273569fd389ab86e75749166a953f015ecb9 diff --git a/qtpurchasing b/qtpurchasing index 54adaada..b888333a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 54adaada25f2d8b44f9f15dc6e1b77e73f3cbdd3 +Subproject commit b888333a425e3a5d52c06e9891440b7c056bdca6 diff --git a/qtqa b/qtqa index 4132995e..6dc5301b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4132995e596add89465950d33aa95ce7f6e25e83 +Subproject commit 6dc5301b5ba37b05711c89ac9d761c75d793f35b diff --git a/qtquickcontrols b/qtquickcontrols index 3b71eea2..4f5b04a5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3b71eea2e6e712103452c98756cd6ce53aa4ebca +Subproject commit 4f5b04a5f6376b3b29e37abb6301cc1bdab5af83 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4e11d09f..4865136b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4e11d09fdef369af130c86a81df599ee3273ac7d +Subproject commit 4865136be9c61aab50c8f30942996bba58a59c3b diff --git a/qtremoteobjects b/qtremoteobjects index 65b33841..6b0f6734 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 65b338416e5846c3d41f0286ad3020f4a5132e45 +Subproject commit 6b0f6734ef2549c27677e8af4a5d0bb92cd86c5c diff --git a/qtrepotools b/qtrepotools index 5655cafd..24801f60 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 5655cafd10c3247715cdaf99d857f25af2a4be15 +Subproject commit 24801f60f05f013f728654d06b35616eec2ef089 diff --git a/qtscript b/qtscript index a951c3cf..2e67664e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a951c3cf75fe1da3148b12f2aff2853b4d368909 +Subproject commit 2e67664efc66e2f96eb8c6859bef6d6a4160bade diff --git a/qtscxml b/qtscxml index cf06df0f..806eae6e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit cf06df0f8e0488be366aab2645fd5470992c8a4e +Subproject commit 806eae6ed05ba114cdf1d35aa2b0855ebfb5d15b diff --git a/qtsensors b/qtsensors index b2765e09..a2d3d45f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b2765e0922699afd654ef77e849148dba41384c0 +Subproject commit a2d3d45f3e9f779a4fc10f8df07b9bd921e755c6 diff --git a/qtserialbus b/qtserialbus index 9fe2ea2e..ac06c016 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9fe2ea2e0d8e696d7ba7d2dd03325007c2e415cc +Subproject commit ac06c016c043a75200488c48125336a6e66d74fa diff --git a/qtserialport b/qtserialport index ca6052a6..6e9661d0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ca6052a651b63b05a4deb6c85a2e627ab022264a +Subproject commit 6e9661d0503503d5e8782a18730b0e3a83902257 diff --git a/qtspeech b/qtspeech index afc9e36a..34a26b67 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit afc9e36a93e9b5d00abc6ecc1424179453c16773 +Subproject commit 34a26b6773f1d9a5592ecb02e08209a0b74fa92f diff --git a/qtsvg b/qtsvg index 59c8f354..1262e6dc 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 59c8f354644b6016c6e0ac45e60d821544c6d4d2 +Subproject commit 1262e6dc979d0624307897980be27b8310fe34a0 diff --git a/qttools b/qttools index 57d008ad..262c25ed 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 57d008adf719a5542375bdf7a4b8ca55a7d5bedb +Subproject commit 262c25edb6ed3854166fd2bcee9299f32d33afd0 diff --git a/qttranslations b/qttranslations index 3e0de1e1..c3710721 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d +Subproject commit c37107219f9e4adde9e463083e188830c0e911a8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0a930720..aaaa35d4 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0a93072035e7fc3fdc616674a18e1bb8e3dcdd89 +Subproject commit aaaa35d40b1bbdf7cdd04aa433f93b248fded26b diff --git a/qtwayland b/qtwayland index 25a089b2..3f81cab3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 25a089b24844579f3623443182465f2d6f41da3a +Subproject commit 3f81cab306946d6beb244ffc53de67a01674607e diff --git a/qtwebchannel b/qtwebchannel index ed82d154..1906f624 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ed82d154255b1bde0e44f0be174cee6e90173f86 +Subproject commit 1906f62469e608f712c1507dabd74638e38d8075 diff --git a/qtwebengine b/qtwebengine index c56169f7..195db907 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c56169f7a1bcbe45f3c89a78b8a5a4606666db83 +Subproject commit 195db907ece72ef0d5c5aa9162284c68f50ae2f7 diff --git a/qtwebglplugin b/qtwebglplugin index 10f1effd..e87065b1 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 10f1effdc1c776c24b5314024aa3d04752dd2dfe +Subproject commit e87065b17b9797aaeb0405a9c4b6191d1745d505 diff --git a/qtwebsockets b/qtwebsockets index 2954e011..b2478bfb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2954e0112aac4d76aa8c78b3261de665621edbc6 +Subproject commit b2478bfb1f9cb48e077aeefd7a52be5d74de6437 diff --git a/qtwebview b/qtwebview index 1ac5e98a..c95d904f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 1ac5e98a02f4467033c1159860b20e4b6a5d45c4 +Subproject commit c95d904fa11b925a1617e4b5b2a87915079d8642 diff --git a/qtwinextras b/qtwinextras index 72d6faa5..da2c3338 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 72d6faa5fb31aaba2bf2dea25971f23b34244f24 +Subproject commit da2c33386d4c55638c5d2d797ea416562e98d3cb diff --git a/qtx11extras b/qtx11extras index 35645ce8..afe8c03b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 35645ce85bd0d48e8fd74b59898394e678ce1655 +Subproject commit afe8c03b6d652ce57118f7a594018867e654edc0 diff --git a/qtxmlpatterns b/qtxmlpatterns index 3b5a20dc..dbc1311a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3b5a20dc02bd00032a19c2951bfa940e6d83aca0 +Subproject commit dbc1311af757c5acdca034d3632dca3bf1f81af5 From b6fd915b26cca5a23861127c702375ea6ea41f03 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 20 Mar 2018 10:31:09 +0100 Subject: [PATCH 12/21] Remove packagekit (update notifications) from RHEL 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PackageKit and gnome-software run in the background and at some point will show popups to ask the user to update. Change-Id: I99a3314c8788c7cc06e479718306a822bf255fbd Reviewed-by: Jędrzej Nowacki Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index a0fa62a9..fba8c1b2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -35,6 +35,9 @@ set -ex +# Remove update notifications and packagekit running in the background +sudo yum -y remove PackageKit gnome-software + installPackages=() installPackages+=(git) installPackages+=(zlib-devel) From 781d243f896486c26524b69f9956c6f597a16b37 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 1 Aug 2018 04:33:30 +0300 Subject: [PATCH 13/21] Update submodules on '5.11' in qt5 Change-Id: I3989272610c8c491f9c3a989e79cae36ad036d88 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtmacextras | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index ef2b1fe0..6caecac1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ef2b1fe00f881af7168e2fd8746d2270ec43b11c +Subproject commit 6caecac1c8ad88cec373f7f7ea14cab9931ed2a1 diff --git a/qtbase b/qtbase index 0ef66e98..46fc3d37 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e +Subproject commit 46fc3d3729df9e81e42f87c46907d6eb81a0c669 diff --git a/qtdeclarative b/qtdeclarative index a5dff730..a30138ca 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a5dff7302cea62f3cfe3235cf64c359b2464d126 +Subproject commit a30138cae86268d71415bc88cfba157977f4a442 diff --git a/qtdoc b/qtdoc index c4b4982c..979a1170 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c4b4982cf82494fe9664a2d200ef29d5e5e5cdb3 +Subproject commit 979a117029f8798e0a905fc8459d6083d237972d diff --git a/qtgamepad b/qtgamepad index 98ea3cf1..7d1b726d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 98ea3cf16e978efb9d3dc7c8708dfa739a796ba9 +Subproject commit 7d1b726d0c338162be5e388bc594a52714d20f18 diff --git a/qtmacextras b/qtmacextras index 169bc0d4..61df18da 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 169bc0d4531bca679007fabf416ccceeb39d4450 +Subproject commit 61df18dac61bab1bc9fbc971ac9a6107734e2ee8 diff --git a/qttranslations b/qttranslations index c3710721..e16121e9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c37107219f9e4adde9e463083e188830c0e911a8 +Subproject commit e16121e919ed3d35ec42480875553d0f533b028d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index aaaa35d4..bf39468a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit aaaa35d40b1bbdf7cdd04aa433f93b248fded26b +Subproject commit bf39468a6368b055335c6b73da65577ec55731ee diff --git a/qtwebengine b/qtwebengine index 195db907..6f9edfab 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 195db907ece72ef0d5c5aa9162284c68f50ae2f7 +Subproject commit 6f9edfab79b53c06152bc9e049c4f69bc0c440e4 diff --git a/qtx11extras b/qtx11extras index afe8c03b..acebfcd6 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit afe8c03b6d652ce57118f7a594018867e654edc0 +Subproject commit acebfcd63f34123e9a57d4ab76526eb0dd8cefff From 37ad6b0144870c4d2139d1dadce34c9883013998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 12 Mar 2018 15:41:29 +0200 Subject: [PATCH 14/21] Use local Ubuntu repositories with Ubuntu 16.04 Using cached local repositories saves us outgoing bandwidth. This way we also get version pinned packages. Change-Id: I475c62c3e408d71e85f24d74dd384c62de583403 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index e78cba17..e613edc0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -162,3 +162,10 @@ echo "Running update for apt" sudo apt-get update echo "Installing packages" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" + +sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse +EOC From 51ea6f28953c681a94312fb421fd03d67f6e89e3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 2 Aug 2018 04:32:55 +0300 Subject: [PATCH 15/21] Update submodules on '5.11' in qt5 Change-Id: I43f504b9f30ce021fc38f7115cbc7d61d9b9d790 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtserialbus | 2 +- qtserialport | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 6caecac1..8b9f4b09 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6caecac1c8ad88cec373f7f7ea14cab9931ed2a1 +Subproject commit 8b9f4b0936b131dad72f0ea8da1347957af20c6e diff --git a/qtbase b/qtbase index 46fc3d37..2de297f1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 46fc3d3729df9e81e42f87c46907d6eb81a0c669 +Subproject commit 2de297f1b76b97146a4ef0a74b996c8fa6154ff8 diff --git a/qtserialbus b/qtserialbus index ac06c016..226bd2f8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ac06c016c043a75200488c48125336a6e66d74fa +Subproject commit 226bd2f84c807b5401a82832dafa48d34966052a diff --git a/qtserialport b/qtserialport index 6e9661d0..e0bd3949 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6e9661d0503503d5e8782a18730b0e3a83902257 +Subproject commit e0bd3949c30ce9c1988a6d6a3c0850d16a1fb33a From d60ef0b202470dce0bba6ec722c0564e97f2b5a7 Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Thu, 2 Aug 2018 11:25:54 +0200 Subject: [PATCH 16/21] Remove broken qtquick1 submodule This submodule have not been maintained in several years. Building currently fails due to qtquick1 not being in sync with interface changes in qtbase. I think it's therefore better to just remove the submodule altogether. That way we stop causing problems for external developers wanting to build Qt from source. Task-number: QTBUG-69725 Change-Id: I905888d99f510be12c484f7da52986c9b1e9478f Reviewed-by: Simon Hausmann Reviewed-by: Oswald Buddenhagen --- .gitmodules | 7 ------- qtquick1 | 1 - 2 files changed, 8 deletions(-) delete mode 160000 qtquick1 diff --git a/.gitmodules b/.gitmodules index 565896cc..9ac0ec9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,13 +143,6 @@ url = ../qtimageformats.git branch = 5.11 status = addon -[submodule "qtquick1"] - depends = qtscript - recommends = qtsvg qtxmlpatterns - path = qtquick1 - url = ../qtquick1.git - branch = dev - status = ignore [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects diff --git a/qtquick1 b/qtquick1 deleted file mode 160000 index 92c847e5..00000000 --- a/qtquick1 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92c847e56d94c9032f3fa83922742e455233e4f3 From 814b318048a1c07e78c8c35a2654b6842915a916 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 4 Aug 2018 04:33:16 +0300 Subject: [PATCH 17/21] Update submodules on '5.11' in qt5 Change-Id: Ic787c30a4a0654d4f0cd8fd484ff9ce0247e0030 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtmultimedia | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 8b9f4b09..0b10ab79 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8b9f4b0936b131dad72f0ea8da1347957af20c6e +Subproject commit 0b10ab797fea863ff2c4897b1c4eb993b21b153d diff --git a/qtbase b/qtbase index 2de297f1..133fb029 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2de297f1b76b97146a4ef0a74b996c8fa6154ff8 +Subproject commit 133fb029a6b9c3ee06792887b61c8ed52315f58b diff --git a/qtmultimedia b/qtmultimedia index 7936c055..02ac3f58 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7936c055b6becd8e291a93c1d9955a0f460e2d6c +Subproject commit 02ac3f58721bb52db612acd3bb2e2c26bfc3e05b diff --git a/qtremoteobjects b/qtremoteobjects index 6b0f6734..f65fb4a2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6b0f6734ef2549c27677e8af4a5d0bb92cd86c5c +Subproject commit f65fb4a28d635de83f35c391d694768d5da76a23 diff --git a/qttools b/qttools index 262c25ed..6db52757 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 262c25edb6ed3854166fd2bcee9299f32d33afd0 +Subproject commit 6db52757d81870fe547d62e677fa0757fd663fcb diff --git a/qttranslations b/qttranslations index e16121e9..60de15a0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e16121e919ed3d35ec42480875553d0f533b028d +Subproject commit 60de15a0e0121096239cf6031250d2862e77971d diff --git a/qtwayland b/qtwayland index 3f81cab3..2c48ee65 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3f81cab306946d6beb244ffc53de67a01674607e +Subproject commit 2c48ee65e8c3b894caec214641723d0777fc60b8 diff --git a/qtwebengine b/qtwebengine index 6f9edfab..0c01be81 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6f9edfab79b53c06152bc9e049c4f69bc0c440e4 +Subproject commit 0c01be81920123a3c3456b727efcb2e9593c65df From f2fae0b7b18200a997f936f67597d4524613e182 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 2 Aug 2018 08:01:21 +0200 Subject: [PATCH 18/21] Provisioning: MQTT: Switch download order We should try the internal ones first. Change-Id: Id0bb3c00e0a1359004f66435a452c30ee4997689 Reviewed-by: Simon Hausmann --- coin/provisioning/common/windows/mqtt_broker.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index 7cb8dd7c..be666ac8 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -38,8 +38,8 @@ $zip = Get-DownloadLocation "pahotest.zip" $commitSHA = "ef4dbc182ddd06247e4b2618d5ad0a57df12ab25" $sha1 = "ba2b7d05afe4e13446d40cd4e753dda7f325a587" -$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip" -$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip" +$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip" Download $externalUrl $internalUrl $zip Verify-Checksum $zip $sha1 From 53f4bb2d9259c9ea3c41ee7ee0a8635f90b8bda8 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 31 Jul 2018 14:22:35 +0200 Subject: [PATCH 19/21] Provisioning: Update MQTT test broker Updates required for latest MQTT5 features and fixes. Change-Id: I63e967efafbe1b22800e338b6c431febe3389a45 Reviewed-by: Simon Hausmann --- coin/provisioning/common/unix/mqtt_broker.sh | 4 ++-- coin/provisioning/common/windows/mqtt_broker.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index 0f3e32aa..2d79c77b 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -39,10 +39,10 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -CommitSHA="ef4dbc182ddd06247e4b2618d5ad0a57df12ab25" +CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65" PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -SHA1="ba2b7d05afe4e13446d40cd4e753dda7f325a587" +SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index be666ac8..f362f55c 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -35,8 +35,8 @@ Write-Host "MQTT: Downloading Paho test broker..." $zip = Get-DownloadLocation "pahotest.zip" -$commitSHA = "ef4dbc182ddd06247e4b2618d5ad0a57df12ab25" -$sha1 = "ba2b7d05afe4e13446d40cd4e753dda7f325a587" +$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65" +$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd" $internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip" $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip" From 8646f7cf9e0ab2b59624dad0e7405a9d055c38eb Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 25 Jun 2018 14:59:36 +0200 Subject: [PATCH 20/21] Remove outdated archive names from README There are no distinct commercial and opensource source archives anymore. Some people do also build from git, so adding the archive name here is just misleading. Given that users read the README, they arguably should know already where the sources are ... Change-Id: I42aac84cd0c904b7b6f2dbb19cacf8b3021f6b21 Reviewed-by: Oswald Buddenhagen Reviewed-by: Jani Heikkinen --- README | 2 -- 1 file changed, 2 deletions(-) diff --git a/README b/README index b3402fdc..dd4af0d5 100644 --- a/README +++ b/README @@ -21,12 +21,10 @@ HOW TO BUILD QT5 Opensource users: - = qt-everywhere-opensource-src- = -opensource Commercial users: - = qt-everywhere-enterprise-src- = -commercial Linux, Mac: From 00730d1caf7c5fb2e4eb914985c41e9221a03708 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 5 Aug 2018 04:32:30 +0300 Subject: [PATCH 21/21] Update submodules on '5.11' in qt5 Change-Id: Ibe011d723e946afb21d6631ba0b6c9ef25aa9e43 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtwayland | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 133fb029..64a560d9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 133fb029a6b9c3ee06792887b61c8ed52315f58b +Subproject commit 64a560d977a0a511ef541d6116d82e7b5c911a92 diff --git a/qtwayland b/qtwayland index 2c48ee65..a6cfa65e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2c48ee65e8c3b894caec214641723d0777fc60b8 +Subproject commit a6cfa65eae4d15c7ad5e7411d998332179080fbd