From 742737bd7c86ecb807c2c2bacd4558a47643963c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 1 Apr 2017 15:31:18 +0200 Subject: [PATCH 1/4] Update submodules on '5.6' in qt5 Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 22330f9f..2fbd30b1 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 22330f9fb7eb79c6fd273abe469e93e5cb9432e7 +Subproject commit 2fbd30b1de6abcb7b660083dde120c8b03a3abbc diff --git a/qtbase b/qtbase index 1cf75af3..a647004d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1cf75af3f2f3430bab11f9ef1eea5deb4c59aa2e +Subproject commit a647004d9f349e0edc4254dcfe672ccf18f98ea7 diff --git a/qtdeclarative b/qtdeclarative index 8e26ddf9..be66de89 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8e26ddf986d4f4309063ad0d81947c0fa14a2574 +Subproject commit be66de89e49286d0812f6a7bee19dccbf03dcb88 diff --git a/qtrepotools b/qtrepotools index ae6a386f..91471704 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 +Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3 diff --git a/qtsvg b/qtsvg index 6d255448..810b6def 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6d255448e5d12379cc5411dade9b03a4bbf0fb70 +Subproject commit 810b6defac666c7652a77b5e4fd5b70a6fbe0c54 diff --git a/qttools b/qttools index e2ef038c..d8e6c1e5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e2ef038ceec6129ae282a9d26523d97126b9a4cb +Subproject commit d8e6c1e55d311afb6a0e37cb4d54ad51dec221da diff --git a/qtwebengine b/qtwebengine index 898cea6a..56edd178 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 898cea6acf6e25dcf90589e111b2365eb815f94b +Subproject commit 56edd178fc31f43297fcbd503edcba1dd5d9e6e8 diff --git a/qtwebkit b/qtwebkit index a52dd53a..8f0971a1 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a52dd53ae4e1c33ee8400c65db3af868edd988b3 +Subproject commit 8f0971a1425e5d322af576581e225e4d0e6e5313 From e7fc74d78121ecf7a9d14e8fb0e65cd441be3e83 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Apr 2017 20:11:14 +0200 Subject: [PATCH 2/4] Update submodules on '5.6' in qt5 Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qtqa | 2 +- qttranslations | 2 +- qtwebkit | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index be66de89..aebb0f69 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit be66de89e49286d0812f6a7bee19dccbf03dcb88 +Subproject commit aebb0f69502a38262ae57cc905efbe5fdc315f9a diff --git a/qtqa b/qtqa index 02deca89..cdd49851 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 02deca89108dc761fb2f72923718e3c35ce8bf89 +Subproject commit cdd49851abf4aed4f960c4d7cef6c3bd08d5a961 diff --git a/qttranslations b/qttranslations index 8f0b19ce..e925ae19 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8f0b19ce4c7127bb957e6dd2152b90445376bacc +Subproject commit e925ae199008908b971f02335acec41e3ebd80a2 diff --git a/qtwebkit b/qtwebkit index 8f0971a1..95a78c9f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 8f0971a1425e5d322af576581e225e4d0e6e5313 +Subproject commit 95a78c9f04d9a3f954477855f84180ced556a480 From 315b76dc9b48456018490675339c084b9e17b2d0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 27 Mar 2017 16:01:31 +0200 Subject: [PATCH 3/4] fix url normalization after 8c0390143, we cannot rely on the denormalized segment starting with a slash any more. Task-number: QTBUG-59753 Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b Reviewed-by: Edward Welbourne Reviewed-by: Valentin Fokin --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index ff3390f8..861511b9 100755 --- a/init-repository +++ b/init-repository @@ -316,7 +316,7 @@ sub git_clone_all_submodules my ($mod, $base) = ($1, $3); next if ($base !~ /^\.\.\//); $base = $my_repo_base.'/'.$base; - while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {} + while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {} $subbases{$mod} = $base; } elsif ($2 eq "update") { push @subset, '-'.$1 if ($3 eq 'none'); From 5656b4848e8c8bf60274c36094dede63aa93e89b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Feb 2017 20:48:22 +0100 Subject: [PATCH 4/4] serialize build of qtwebkit and qtwebengine linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann --- .gitmodules | 1 + qt.pro | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9bcdf4ce..b4d74220 100644 --- a/.gitmodules +++ b/.gitmodules @@ -72,6 +72,7 @@ [submodule "qtwebkit"] depends = qtbase recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns + serialize = qtwebengine path = qtwebkit url = ../qtwebkit.git branch = 5.6 diff --git a/qt.pro b/qt.pro index f8d3d4d3..bf510fab 100644 --- a/qt.pro +++ b/qt.pro @@ -26,14 +26,14 @@ for (line, lines) { } QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules -modules = $$sort_depends(modules, module., .depends .recommends) +modules = $$sort_depends(modules, module., .depends .recommends .serialize) modules = $$reverse(modules) for (mod, modules) { equals(module.$${mod}.qt, false): \ next() deps = $$eval(module.$${mod}.depends) - recs = $$eval(module.$${mod}.recommends) + recs = $$eval(module.$${mod}.recommends) $$eval(module.$${mod}.serialize) for (d, $$list($$deps $$recs)): \ !contains(modules, $$d): \ error("'$$mod' depends on undeclared '$$d'.")