From e50f5b915017882abcd287d53b794b9c3ed16f42 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 May 2016 01:00:40 +0300 Subject: [PATCH 01/12] Updated submodules. Change-Id: I9b4f1c3daedf21ab201027d5793aa162710c84af Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index 38baf18d..0384f298 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 38baf18df4c572ef36dc203ea9172f3e7b44e06d +Subproject commit 0384f29809186e6a45b13760c9dbb2f8cd3bf251 diff --git a/qtactiveqt b/qtactiveqt index a4b8485c..ceb1b32e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a4b8485cd38a9c33cdcf1b97633fa65b7230643b +Subproject commit ceb1b32e0dba6d3826333f83e10eba50565dfe32 diff --git a/qtandroidextras b/qtandroidextras index c6671096..827e255b 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c6671096efe8c07d55cbf32b892a24ceea8d5bd2 +Subproject commit 827e255b6f380af2ec303f446c8cd8af33dfa8b0 diff --git a/qtbase b/qtbase index ce37467a..1acb29c3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ce37467acf34edf1380f896a0942b616dc4cbead +Subproject commit 1acb29c3dd53fe675c71b05a5364e5b77ec0fe2a diff --git a/qtcanvas3d b/qtcanvas3d index ab58e494..32ce46cb 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ab58e494db8a6506dd254a6ce961743dc10c4bc8 +Subproject commit 32ce46cb702f95860ad404e5a966589f91c105c7 diff --git a/qtconnectivity b/qtconnectivity index 54c9cd9e..2cdc2938 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 54c9cd9e28bc6f0a2fa5118cfdbe922d71db6623 +Subproject commit 2cdc2938b44448b8d07cc229282d26d3bca3ee91 diff --git a/qtdeclarative b/qtdeclarative index 48492b2e..a82094b6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 48492b2ee5d2f9ad178982f4c16e895b3083d8df +Subproject commit a82094b63b8993630c37f7a71dac19d3f96b2804 diff --git a/qtdoc b/qtdoc index 0f77b33d..f2e8c350 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0f77b33d55d2f0467de00640774b179f8fa3ef69 +Subproject commit f2e8c350ddf42df035ad9ff22e05b627c072f272 diff --git a/qtenginio b/qtenginio index 65f5956b..5bddee78 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 65f5956b1cc00c58c964d43af16165e59a6f4e02 +Subproject commit 5bddee78c2fe009610c982615d1d202399e464e8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 83a50c08..35179f6b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 83a50c0801440324101ad8eff775380a43a564c4 +Subproject commit 35179f6b3116f1cee4586faa7c4f751e6d2e00af diff --git a/qtimageformats b/qtimageformats index bf5b4987..6415dae7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit bf5b49878d75d316f31225f76152e8381a3d5f0f +Subproject commit 6415dae76eb8586f6e520961a76996df2425476d diff --git a/qtlocation b/qtlocation index 5dcd3d85..59a419ad 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5dcd3d8526c7b8c7ac59a743f82130008d254d14 +Subproject commit 59a419adbdb02eaa19c0a716a79ba78b8ff465e6 diff --git a/qtmacextras b/qtmacextras index 5af27ed4..ae58e100 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5af27ed4ed16f823adf609e9790c864c55ed4ee9 +Subproject commit ae58e100d3df71772db4f2f938d0a2ddc8a0873f diff --git a/qtmultimedia b/qtmultimedia index 15951e67..d44a327d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 15951e672eaf38537c82043b0b9b14088facbd19 +Subproject commit d44a327da4a956f62cc0d51095fa4c1d62e130d3 diff --git a/qtquick1 b/qtquick1 index dbc9131e..212653fe 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit dbc9131ebb300e715d5ebd815dc3ef9aa77ebf56 +Subproject commit 212653fea189ad1f5203fe2b5c12caba6f13c72a diff --git a/qtquickcontrols b/qtquickcontrols index 0e00f9fa..7e33119c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 +Subproject commit 7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 835c1c26..f3212709 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 835c1c26ef220cf084a7f066df748182229a4fd6 +Subproject commit f3212709f2cb19f61f09ba551934101800586d1a diff --git a/qtscript b/qtscript index fc9407af..95333d80 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit fc9407affb74bbfa9d396fef32f319b6baa8471f +Subproject commit 95333d804470dac6d529fc68d5dc5bfb7fa30ffe diff --git a/qtsensors b/qtsensors index 127ac081..61891995 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 127ac0810f042999a13db18e68b43be9ab85e708 +Subproject commit 6189199557a2b8eb981f37e6370b47c25b224b4e diff --git a/qtserialbus b/qtserialbus index b8d5c1f1..d1ed290d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b8d5c1f1dff57da6927470543e5d004c237846ac +Subproject commit d1ed290dca79e546986807b492a9aa4b0b1cc55a diff --git a/qtserialport b/qtserialport index 8a30a60a..9c9255ed 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8a30a60a03af3979de8988209f8f77638713c30d +Subproject commit 9c9255eda50af191636ff9f18df35567c307dd8c diff --git a/qtsvg b/qtsvg index cf25ebcf..0eeaceca 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit cf25ebcf482ada36f5b5e0bb983a01cf2ab42f46 +Subproject commit 0eeaceca600ce63711387d4e3375c7a50239802d diff --git a/qttools b/qttools index 38fc6ad3..dee2a188 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 38fc6ad3e789c69dd09b0c494ead107d6da10807 +Subproject commit dee2a1883a9371a3aea647d508be7c758b076e8d diff --git a/qttranslations b/qttranslations index efa6513b..dbe53f81 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit efa6513bbf2515fbe6ab7b365e9597a8900ae279 +Subproject commit dbe53f818a3d88fcd9adc61448eba4890b33f264 diff --git a/qtwayland b/qtwayland index 92038729..d9132f07 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 920387296abcead6fea2d801fb2f57c185657c47 +Subproject commit d9132f078bb168a9a013b97493c219596cc8c6b2 diff --git a/qtwebchannel b/qtwebchannel index bd0f9334..39692e39 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bd0f933457227c615c5f11aacd471e58b88678e8 +Subproject commit 39692e398ef847a1d6482419a617452cb1e5ae0d diff --git a/qtwebengine b/qtwebengine index b052dcaf..ad8bc457 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b052dcaf308d761fa8df39a09f0296b808c928b5 +Subproject commit ad8bc45732eeb2efa6e885d564c10761e7154889 diff --git a/qtwebkit b/qtwebkit index a750b262..f1b22ccf 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a750b262b856178eee47d546944bd095662dccf7 +Subproject commit f1b22ccfb78cc9d18d707e6d6a24a5951c60ffa5 diff --git a/qtwebkit-examples b/qtwebkit-examples index 2050389a..e66c201c 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 2050389a34ac7a28d2ee8b62cc1a87bc471fe89e +Subproject commit e66c201cea9b2b4cd376e7be118da43cdc22198e diff --git a/qtwebsockets b/qtwebsockets index edc358b2..9d28979b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit edc358b213b192e8cdc925a4ae1f176c287d6eea +Subproject commit 9d28979b204313b4db1ce8e9f367204a65be9c64 diff --git a/qtwebview b/qtwebview index b76a913c..2a91ed5d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b76a913c948e61184dbfe6e540cfcdc7f9f11585 +Subproject commit 2a91ed5d421793e6b10b9bbb4b70676c47b4030b diff --git a/qtwinextras b/qtwinextras index 9463d251..3dd2b06d 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 9463d25167fe1e2fc47180331827cbad2a805f67 +Subproject commit 3dd2b06debd316e3656d433686642ffb64951c37 diff --git a/qtx11extras b/qtx11extras index f27489d6..36ae961b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f27489d66cc6d8263130451c26c7e4ae40acc6b4 +Subproject commit 36ae961b08420f14d7ad52ee5dc23ea456accfd9 diff --git a/qtxmlpatterns b/qtxmlpatterns index fcb22201..54eb58fb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fcb22201726669f52f98528d9a15f8cdbb126b48 +Subproject commit 54eb58fb95c4cc33bc46cece8ab9bf4f5e5fb125 From 9443890d60388f27f04b5a87013ca76f9afcc225 Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Thu, 12 May 2016 10:04:57 +0300 Subject: [PATCH 02/12] Fix git_install_hooks for relative gitdir Previously we expected gitdir to be always absolute. This patch fixes git_install_hooks in case of relative gitdir. Change-Id: Ia0883af18229703aaa22c62fd2181ed56d9f2fce Reviewed-by: Oswald Buddenhagen --- init-repository | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/init-repository b/init-repository index 2580b0f6..954237d0 100755 --- a/init-repository +++ b/init-repository @@ -155,9 +155,10 @@ EOF } use Carp qw( confess ); -use English qw( -no_match_vars ); -use Getopt::Long qw( GetOptions ); use Cwd qw( getcwd abs_path ); +use English qw( -no_match_vars ); +use File::Spec::Functions qw ( rel2abs ); +use Getopt::Long qw( GetOptions ); my $script_path = abs_path($0); $script_path =~ s,[/\\][^/\\]+$,,; @@ -558,24 +559,25 @@ sub git_install_hooks my @configresult = qx(git config --list --local); foreach my $line (@configresult) { next if ($line !~ /submodule\.([^.=]+)\.url=/); - my $module = $1.'/.git'; - if (!-d $module) { - open GITD, $module or die "Cannot open $module: $!\n"; + my $module = $1; + my $module_gitdir = $module.'/.git'; + if (!-d $module_gitdir) { + open GITD, $module_gitdir or die "Cannot open $module: $!\n"; my $gd = ; close GITD; chomp($gd); - $gd =~ s/^gitdir: // or die "Malformed .git file $module\n"; - $module = $gd; # We expect it to be always absolute. - if (open COMD, $module.'/commondir') { + $gd =~ s/^gitdir: // or die "Malformed .git file $module_gitdir\n"; + $module_gitdir = rel2abs($gd, $module); + if (open COMD, $module_gitdir.'/commondir') { my $cd = ; chomp($cd); - $module .= '/'.$cd; - $module = abs_path($module); + $module_gitdir .= '/'.$cd; + $module_gitdir = abs_path($module_gitdir); close COMD; } } - $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg'); - $self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit'); + $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module_gitdir.'/hooks/commit-msg'); + $self->ensure_link($hooks.'/git_post_commit_hook', $module_gitdir.'/hooks/post-commit'); } } From 82873b1b1ef8c8c2aa7d956d247aa7e49f57d8e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 28 May 2016 01:00:42 +0300 Subject: [PATCH 03/12] Updated submodules. Change-Id: Iec0cece6ec1ca471593c4acd32595b59dc64a651 Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtenginio | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index ceb1b32e..58930c21 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ceb1b32e0dba6d3826333f83e10eba50565dfe32 +Subproject commit 58930c21bd9bd1bb81f35305a4b1b6115a1f69ec diff --git a/qtbase b/qtbase index 1acb29c3..0e70d35f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1acb29c3dd53fe675c71b05a5364e5b77ec0fe2a +Subproject commit 0e70d35f151c52a8821be987e4cd1aef3d40b010 diff --git a/qtcanvas3d b/qtcanvas3d index 32ce46cb..1a19a68e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 32ce46cb702f95860ad404e5a966589f91c105c7 +Subproject commit 1a19a68e76205650b55fea48477deb95bf328412 diff --git a/qtconnectivity b/qtconnectivity index 2cdc2938..a084e216 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2cdc2938b44448b8d07cc229282d26d3bca3ee91 +Subproject commit a084e2160a345162681af984d9c265f619be7124 diff --git a/qtdeclarative b/qtdeclarative index a82094b6..dbf7efde 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a82094b63b8993630c37f7a71dac19d3f96b2804 +Subproject commit dbf7efde1e04ac0ff445f64438078d87eb035b68 diff --git a/qtenginio b/qtenginio index 5bddee78..d5aec181 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 5bddee78c2fe009610c982615d1d202399e464e8 +Subproject commit d5aec18177acc122b0b7c39a90fbb09d388a01b3 diff --git a/qtlocation b/qtlocation index 59a419ad..f8977758 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 59a419adbdb02eaa19c0a716a79ba78b8ff465e6 +Subproject commit f897775850dfbe0e668e9c8b428537e8bb096c01 diff --git a/qtmultimedia b/qtmultimedia index d44a327d..6d5f3756 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d44a327da4a956f62cc0d51095fa4c1d62e130d3 +Subproject commit 6d5f375644624b977b168928ae09227a9d28547f diff --git a/qtscript b/qtscript index 95333d80..76b5b0c3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 95333d804470dac6d529fc68d5dc5bfb7fa30ffe +Subproject commit 76b5b0c3598a595c61f0cb274b392feeaf3e8dc3 diff --git a/qtserialbus b/qtserialbus index d1ed290d..c8667971 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d1ed290dca79e546986807b492a9aa4b0b1cc55a +Subproject commit c8667971dea7c38862bd3bf190269072e8c2fe6d diff --git a/qtsvg b/qtsvg index 0eeaceca..600ae02b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0eeaceca600ce63711387d4e3375c7a50239802d +Subproject commit 600ae02bce34b5cd56c1ddc99553bf661ae96b1a diff --git a/qttools b/qttools index dee2a188..ec575c44 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dee2a1883a9371a3aea647d508be7c758b076e8d +Subproject commit ec575c44637744413b106388cd0ed1d399fc7871 diff --git a/qttranslations b/qttranslations index dbe53f81..674d2ca9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit dbe53f818a3d88fcd9adc61448eba4890b33f264 +Subproject commit 674d2ca9f7c51f3621c9e2b36c9f02528dd23d40 diff --git a/qtwebchannel b/qtwebchannel index 39692e39..bec50124 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 39692e398ef847a1d6482419a617452cb1e5ae0d +Subproject commit bec50124b893c4632829d9806f49f64c4debf936 diff --git a/qtwebengine b/qtwebengine index ad8bc457..f5315653 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ad8bc45732eeb2efa6e885d564c10761e7154889 +Subproject commit f531565348e550bc2e03917874009331556f0d66 diff --git a/qtwebkit b/qtwebkit index f1b22ccf..da5f9d78 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit f1b22ccfb78cc9d18d707e6d6a24a5951c60ffa5 +Subproject commit da5f9d788f96340a44083ed4e28cdf6ea0a393f0 diff --git a/qtwebkit-examples b/qtwebkit-examples index e66c201c..2a143bf8 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit e66c201cea9b2b4cd376e7be118da43cdc22198e +Subproject commit 2a143bf81b2ffb3bd7a5f47cf719e6ed347bf383 diff --git a/qtwebsockets b/qtwebsockets index 9d28979b..10cad9ec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9d28979b204313b4db1ce8e9f367204a65be9c64 +Subproject commit 10cad9ece2cb380e26e03a1c03b900f8e3b4c801 diff --git a/qtwebview b/qtwebview index 2a91ed5d..a92d9644 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 2a91ed5d421793e6b10b9bbb4b70676c47b4030b +Subproject commit a92d964417bf1b4d5de720bae1157f2c9a870173 diff --git a/qtxmlpatterns b/qtxmlpatterns index 54eb58fb..64e5f2be 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 54eb58fb95c4cc33bc46cece8ab9bf4f5e5fb125 +Subproject commit 64e5f2be2ba63aa1ed04291dc529f2b8edee9a0b From 2be9656332f86450dd198023944590b267bab1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 27 May 2016 15:07:53 +0200 Subject: [PATCH 04/12] Coin provisioning: overwrite files while unzipping Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/helpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index f517e94d..d7b957f3 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -27,5 +27,5 @@ function Extract-Zip $shell = new-object -com shell.application $zipfile = $shell.Namespace($Source) $destinationFolder = $shell.Namespace($Destination) - $destinationFolder.CopyHere($zipfile.Items()) + $destinationFolder.CopyHere($zipfile.Items(), 16) } From a97874523f996ccf5b7a297f2489d89b630034d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 26 May 2016 14:40:35 +0200 Subject: [PATCH 05/12] Export CI_ICU_PATH variables on all windows templates That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/icu.ps1 | 9 +++++++++ coin/provisioning/qtci-windows-10-x86/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-10-x86_64/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-7-x86/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-8-x86/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-8-x86_64/icu.ps1 | 6 ++++++ 6 files changed, 39 insertions(+) create mode 100644 coin/provisioning/common/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/icu.ps1 diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 new file mode 100644 index 00000000..4be185e5 --- /dev/null +++ b/coin/provisioning/common/icu.ps1 @@ -0,0 +1,9 @@ +# ICU is already pre-installed on Windows machines, it would be nice to have +# the installation script, but for now let's just export the right variables + +# FIXME: do we really want to have it per MSVC version? What about MSVC2015? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine") +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") + +# FIXME: do we really want to use the 4.8.2 ICU build? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine") diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force From 928c4913977ad4ff99d51105cfa7f20baa3ce6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 26 May 2016 14:29:30 +0200 Subject: [PATCH 06/12] Export CI_JOM_PATH variable on all templates with jom That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344 Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/jom.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1 index c233ee6e..ef012b64 100644 --- a/coin/provisioning/common/jom.ps1 +++ b/coin/provisioning/common/jom.ps1 @@ -5,3 +5,5 @@ $zip = "c:\users\qt\downloads\jom_1_1_0.zip" Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832" Extract-Zip $zip C:\Utils\Jom + +[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine") From 3529d894ba505444c9e160bba1ef0595892ec712 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 31 May 2016 14:14:59 +0200 Subject: [PATCH 07/12] OSX: Switch crash reporting to server mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meaning: to unattended use, so no crash dialogs will pop up. In a later change we can suppress QTest from generating stack traces when this setting is *not* in server mode (meaning: the OS will take care of the stack traces). Change-Id: Idee9311f866228cd35ecb07889f1c19424981221 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki Reviewed-by: Frederik Gladhorn --- coin/provisioning/qtci-osx-10.10/crashreporter.sh | 2 ++ coin/provisioning/qtci-osx-10.11/crashreporter.sh | 2 ++ coin/provisioning/qtci-osx-10.8/crashreporter.sh | 2 ++ coin/provisioning/qtci-osx-10.9/crashreporter.sh | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.11/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.8/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.9/crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server From 51cf8dcf3b991104eca2e8ef45ba5cc3c35ccfd6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 5 Jun 2016 01:00:46 +0300 Subject: [PATCH 08/12] Updated submodules. Change-Id: Iec9d13ae71c8660baec5ca6cfee57aeee3b33922 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qtbase b/qtbase index 0e70d35f..fd709786 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0e70d35f151c52a8821be987e4cd1aef3d40b010 +Subproject commit fd70978693bd92761e9989bc1c76bf83c1e8c987 diff --git a/qtconnectivity b/qtconnectivity index a084e216..c347a374 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a084e2160a345162681af984d9c265f619be7124 +Subproject commit c347a3748af663da9e8e6ce5e233248b80217f96 diff --git a/qtdeclarative b/qtdeclarative index dbf7efde..6d63e3ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dbf7efde1e04ac0ff445f64438078d87eb035b68 +Subproject commit 6d63e3ba09954ce7b56b4b24432bd036e636b164 diff --git a/qtdoc b/qtdoc index f2e8c350..d167afbe 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f2e8c350ddf42df035ad9ff22e05b627c072f272 +Subproject commit d167afbe0ec394b28618a8af44eada7c7849c7c5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 35179f6b..b73cf345 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 35179f6b3116f1cee4586faa7c4f751e6d2e00af +Subproject commit b73cf34563419852cbe01ffee3b57f5e21cc81e7 diff --git a/qtimageformats b/qtimageformats index 6415dae7..b144bfbc 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6415dae76eb8586f6e520961a76996df2425476d +Subproject commit b144bfbc30a80da9357ab528d905a4bd5935d659 diff --git a/qtlocation b/qtlocation index f8977758..07b9d583 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f897775850dfbe0e668e9c8b428537e8bb096c01 +Subproject commit 07b9d583273b8e3aa5712eac9d06b74ddb927db3 diff --git a/qtmultimedia b/qtmultimedia index 6d5f3756..b3af8f65 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d5f375644624b977b168928ae09227a9d28547f +Subproject commit b3af8f65fcaef66504f5640ccaa2972e17af1af0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f3212709..1583f8b2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f3212709f2cb19f61f09ba551934101800586d1a +Subproject commit 1583f8b2ee56726f7920524b85636bb831c2f0d0 diff --git a/qtscript b/qtscript index 76b5b0c3..4c8efb40 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 76b5b0c3598a595c61f0cb274b392feeaf3e8dc3 +Subproject commit 4c8efb407fa9ebfe3e1923970140cfe270fda75d diff --git a/qtsensors b/qtsensors index 61891995..79d3d49c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6189199557a2b8eb981f37e6370b47c25b224b4e +Subproject commit 79d3d49c4c4bf1d07f377d24d8c6e571abe80355 diff --git a/qtserialbus b/qtserialbus index c8667971..40be986e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8667971dea7c38862bd3bf190269072e8c2fe6d +Subproject commit 40be986e18f244126f934c3bb0351ecb062a2060 diff --git a/qtsvg b/qtsvg index 600ae02b..415572bb 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 600ae02bce34b5cd56c1ddc99553bf661ae96b1a +Subproject commit 415572bb872af5d30943ab396d1f89de918ca54b diff --git a/qttools b/qttools index ec575c44..5bbd37f8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ec575c44637744413b106388cd0ed1d399fc7871 +Subproject commit 5bbd37f8d8ac1c4e9b13cb939370f5c617a4ec68 diff --git a/qtwayland b/qtwayland index d9132f07..d9cef40e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d9132f078bb168a9a013b97493c219596cc8c6b2 +Subproject commit d9cef40ea3948e5d74120fb07909332503dc485b diff --git a/qtwebchannel b/qtwebchannel index bec50124..224742f0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bec50124b893c4632829d9806f49f64c4debf936 +Subproject commit 224742f0e2e882bce21047622d4c351803b9d486 diff --git a/qtwebengine b/qtwebengine index f5315653..bfcbdc3a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f531565348e550bc2e03917874009331556f0d66 +Subproject commit bfcbdc3ab42880dc37ffa7174af96928ccf25f03 diff --git a/qtwebview b/qtwebview index a92d9644..70cc7914 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a92d964417bf1b4d5de720bae1157f2c9a870173 +Subproject commit 70cc791481204708df6a926a0a65155be2afaf7a diff --git a/qtxmlpatterns b/qtxmlpatterns index 64e5f2be..e8beed4a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 64e5f2be2ba63aa1ed04291dc529f2b8edee9a0b +Subproject commit e8beed4a4491ce0d9d53bb82eb037211b29f58c1 From 451f93e26b46cad8d77438606d0103c7c5005546 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 12 Jun 2016 01:00:40 +0300 Subject: [PATCH 09/12] Updated submodules. Change-Id: I5ad7c931f77a167ca4574fd20eb6fe783d95a297 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebview | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 0384f298..fcea0310 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0384f29809186e6a45b13760c9dbb2f8cd3bf251 +Subproject commit fcea0310a307a4adf36f382806b34ff1ee3eb913 diff --git a/qtandroidextras b/qtandroidextras index 827e255b..f512a085 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 827e255b6f380af2ec303f446c8cd8af33dfa8b0 +Subproject commit f512a085d360bbeea16188fd3cae421a29cf9b71 diff --git a/qtbase b/qtbase index fd709786..b465fe75 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fd70978693bd92761e9989bc1c76bf83c1e8c987 +Subproject commit b465fe759695bb7e1de693c3d4d20acfd2c49779 diff --git a/qtconnectivity b/qtconnectivity index c347a374..7b4d1325 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c347a3748af663da9e8e6ce5e233248b80217f96 +Subproject commit 7b4d1325ecf41ed76a5beca584702ccb5a9b5d6d diff --git a/qtdeclarative b/qtdeclarative index 6d63e3ba..4f94ddcf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6d63e3ba09954ce7b56b4b24432bd036e636b164 +Subproject commit 4f94ddcf295c59dec86c8570c19e3e7427d68b06 diff --git a/qtdoc b/qtdoc index d167afbe..36734169 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d167afbe0ec394b28618a8af44eada7c7849c7c5 +Subproject commit 36734169ac134f6477077c5ec226d19f4dd59cb0 diff --git a/qtlocation b/qtlocation index 07b9d583..f1f876b3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 07b9d583273b8e3aa5712eac9d06b74ddb927db3 +Subproject commit f1f876b353446ebb271d167482f5e0414f88e10f diff --git a/qtmultimedia b/qtmultimedia index b3af8f65..f5de1410 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b3af8f65fcaef66504f5640ccaa2972e17af1af0 +Subproject commit f5de14107094080f15fad3beffb64ad95ff6c5e4 diff --git a/qtquickcontrols b/qtquickcontrols index 7e33119c..e888ebd3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91 +Subproject commit e888ebd35bbaa236dd186b545400aaad0f2e14cf diff --git a/qtsensors b/qtsensors index 79d3d49c..5a562aa4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 79d3d49c4c4bf1d07f377d24d8c6e571abe80355 +Subproject commit 5a562aa4a923f5585879a9875307aaf85054ed40 diff --git a/qtserialport b/qtserialport index 9c9255ed..1dd9d0f1 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9c9255eda50af191636ff9f18df35567c307dd8c +Subproject commit 1dd9d0f15ef07d1d0c470c5c3e02948a120309a1 diff --git a/qttools b/qttools index 5bbd37f8..2c87670f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5bbd37f8d8ac1c4e9b13cb939370f5c617a4ec68 +Subproject commit 2c87670f4783b7d321bbe31c33d2545597e7bd43 diff --git a/qtwayland b/qtwayland index d9cef40e..53923434 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d9cef40ea3948e5d74120fb07909332503dc485b +Subproject commit 5392343491e93952b520ad43d164dfbe1e550d58 diff --git a/qtwebengine b/qtwebengine index bfcbdc3a..d6e3ba85 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bfcbdc3ab42880dc37ffa7174af96928ccf25f03 +Subproject commit d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 diff --git a/qtwebkit b/qtwebkit index da5f9d78..5b3435cd 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit da5f9d788f96340a44083ed4e28cdf6ea0a393f0 +Subproject commit 5b3435cd1d8715ede24906e374a306ddc6c4dc32 diff --git a/qtwebview b/qtwebview index 70cc7914..cae464f9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 70cc791481204708df6a926a0a65155be2afaf7a +Subproject commit cae464f969e5dcf92e74c92a799fbc6ddb498a63 From 70b3b029773c733043ce29672e981655ca4cad20 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 14 Jun 2016 01:00:41 +0300 Subject: [PATCH 10/12] Updated submodules. Change-Id: I8358eadfea5f3bf8ff8615d3c468201acd58f1b5 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtenginio | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index b465fe75..e969e6d2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b465fe759695bb7e1de693c3d4d20acfd2c49779 +Subproject commit e969e6d2ca5636b87b3de963ebd8dac993275617 diff --git a/qtdeclarative b/qtdeclarative index 4f94ddcf..7f8dc9d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4f94ddcf295c59dec86c8570c19e3e7427d68b06 +Subproject commit 7f8dc9d00c02e0e28cdea92cac8f8e4379bed68b diff --git a/qtenginio b/qtenginio index d5aec181..b74e1ca0 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit d5aec18177acc122b0b7c39a90fbb09d388a01b3 +Subproject commit b74e1ca024540d45105df95e47b9c93b263f7b75 diff --git a/qtmultimedia b/qtmultimedia index f5de1410..af5e0d04 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f5de14107094080f15fad3beffb64ad95ff6c5e4 +Subproject commit af5e0d04852e5efc1ebd9d099f3906bc66a62338 diff --git a/qtwebengine b/qtwebengine index d6e3ba85..9764fa47 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 +Subproject commit 9764fa47ee9b4f8ccf1c7cb0dc073bdc8a4f9c86 diff --git a/qtwebkit b/qtwebkit index 5b3435cd..28077218 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 5b3435cd1d8715ede24906e374a306ddc6c4dc32 +Subproject commit 28077218067438fef5cdc746feb45ca6d4e755d9 From 5778d17a6852516ab7522d5447573a04cd883996 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 14 Jun 2016 09:47:10 +0200 Subject: [PATCH 11/12] README: Remove platform specific build requirements The list is not up to date (e.g. ICU is not required on Windows anymore), and woefully incomplete. Better just link to the wiki/documentation. Task-number: QTBUG-54084 Change-Id: I6b22fc1c84d40b892503085cb023a7db25fd19c8 Reviewed-by: Simon Hausmann --- README | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/README b/README index ff169fe2..12969310 100644 --- a/README +++ b/README @@ -16,29 +16,6 @@ HOW TO BUILD QT5 please see section "Setting up your machine" on: http://wiki.qt.io/Get_The_Source - Optional requirements - --------------------- - - - OpenSSL for SSL sockets or HTTPS - - Wayland - - New dependencies in Qt 5 - ------------------------ - - Linux: On systems running X11, the XCB libraries are required for - the platform plugin to build. qtbase/src/plugins/platforms/xcb/README - lists the required packages. - - Qt 5 can make use of the ICU libraries providing Unicode and Globalization - support (see http://site.icu-project.org/). They are required for building - QtWebKit. - On Linux, they will be auto-detected. - On Windows, they need to be manually installed and the "include" and "lib" - folders of the ICU installation must be appended to the INCLUDE and LIB - environment variables after calling the Windows SDK setup script. - The "bin" folder of the ICU installation should be appended to the PATH - environment variable in order to for the DLLs to be found at run-time. - Licensing: ---------- From 9b6d296096aebfd37e332da1389e7bd40d2b6a54 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 14 Jun 2016 09:55:03 +0200 Subject: [PATCH 12/12] README: Do not take deprecated modules as an example Task-number: QTBUG-54084 Change-Id: I03c81822a05fb9a3bda975421228b460c2a00fe2 Reviewed-by: Simon Hausmann --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 12969310..7781f47b 100644 --- a/README +++ b/README @@ -87,11 +87,11 @@ HOW TO BUILD QT5 default in the build system. It is possible to build selected modules with their dependencies by doing - a `make module-'. For example, to build only qtscript and qtwebkit, - and the modules they depend on: + a `make module-'. For example, to build only qtdeclarative, + and the modules it depends on: ./configure -prefix $PWD/qtbase - make -j4 module-qtscript module-qtwebkit + make -j4 module-qtdeclarative This can save a lot of time if you are only interested in a subset of Qt5.