From 24e1a15d40c02d5cd47644d37f713182830dfb4f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2018 14:07:13 +0200 Subject: [PATCH 01/19] Adjust submodule branches Change-Id: Ic069e5dedce639cb1c17df06ee43e87eacc139d8 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 565896cc..33621a0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.11 + branch = 5.11.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.11 + branch = 5.11.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.11 + branch = 5.11.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.11 + branch = 5.11.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.11 + branch = 5.11.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.11 + branch = 5.11.0 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.11 + branch = 5.11.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.11 + branch = 5.11.0 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.11 + branch = 5.11.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.11 + branch = 5.11.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.11 + branch = 5.11.0 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.11 + branch = 5.11.0 status = preview From 2671e050231d9fbbbaecde7738737e311a239589 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Apr 2018 12:23:09 +0200 Subject: [PATCH 02/19] Update submodules on '5.11.0' in qt5 Change-Id: Ie95476e1e3f240b8a55da79b09c65736f240272e Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qt3d b/qt3d index 4f772615..6d73c51d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4f7726155f586ae3aef0b111ae25eacaab91afe9 +Subproject commit 6d73c51d44d10925a05804cd8e70978f155643df diff --git a/qtandroidextras b/qtandroidextras index a2157a9d..b36bf0b3 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a2157a9dd2ee4ed3e998654595544dadaf129fe8 +Subproject commit b36bf0b3eaa026e22a87865e106f54be6b520811 diff --git a/qtbase b/qtbase index 436a6fbb..2b5587d9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 436a6fbb835906e1c62a11dfc7de61461ec767b0 +Subproject commit 2b5587d901a0cc23749bf27a923d50bf0e5860d3 diff --git a/qtcharts b/qtcharts index 165c7683..d3f9275c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 165c768306357ace7c6a52e72c9c4c883c59de0c +Subproject commit d3f9275cbaa6a6059298ec248dd28dd6ef065e51 diff --git a/qtconnectivity b/qtconnectivity index 96afc728..e68b5e17 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 96afc728c508708da7a5fa16266dcafafcb60d0b +Subproject commit e68b5e17b071ca11974474546be04c7d564eae3a diff --git a/qtdeclarative b/qtdeclarative index 73a34bf8..6069cc1c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 73a34bf8319178f2761811240e7c885849f272e9 +Subproject commit 6069cc1cd1a6309cdffeb8bdd9c4035f33742228 diff --git a/qtdoc b/qtdoc index ba5445a9..5aab2cac 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ba5445a949facd89472f2a54fb88dc57b118786c +Subproject commit 5aab2cac19ef2fbb241ca0bdc7c07388858ca0e1 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3e28d47c..df80153b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3e28d47cea038ca64c2e14ff449cc183c51643ce +Subproject commit df80153bf07b08e5d2ae8ba18f85a9ec15dbaef8 diff --git a/qtimageformats b/qtimageformats index 4e10f354..b83a0a94 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4e10f35483db6d3396fe54dcf3d895d7850f8335 +Subproject commit b83a0a9460432abb82218da247710a1aaf321336 diff --git a/qtlocation b/qtlocation index a4d9f8cb..3d2281cc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a4d9f8cbf2220fbc8aafd8f491313e39e0bf4a5f +Subproject commit 3d2281ccf7400a782f69b7b74cb45d0889708bcc diff --git a/qtmacextras b/qtmacextras index 5f9b1bca..fe8be8f4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5f9b1bca4af0bc7801d513a9424c70b47812cf12 +Subproject commit fe8be8f48cf384a2f1b0f7c03a83aaa81680151b diff --git a/qtmultimedia b/qtmultimedia index c96b95e5..bb7ffc4d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c96b95e50e71dfae82de5b822e7ab758787acd47 +Subproject commit bb7ffc4d847bb2b558693a4ca5d7f3a45c9b9231 diff --git a/qtqa b/qtqa index e3754bc5..46daf8aa 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e3754bc547c44aac2713d6245543ee3df484af8f +Subproject commit 46daf8aac235107d0c77fe3a887ecb73f85b4159 diff --git a/qtquickcontrols b/qtquickcontrols index 654de824..0689a825 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 654de8242411dae548795f9b17648608f8a8c28d +Subproject commit 0689a8256c0a21087c01fff3998fd3b606a5ac4c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ca406d69..c0232099 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ca406d69544e6ddf20d940d903c9c97bca07ff90 +Subproject commit c0232099a9fac03ef0f5287b6a26dbbd46669c06 diff --git a/qtremoteobjects b/qtremoteobjects index c09db54a..55653936 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c09db54aaac45d4acd9b7c52d8d9b1cb48b6fe55 +Subproject commit 556539365ab1eeaab339fc527c4c2130c2f804ff diff --git a/qtscript b/qtscript index 781c7452..c2657d34 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 781c745277f9b4faa87d341b10ec0ca46eb45a73 +Subproject commit c2657d346455a5a7821fbfbe3b1107d7cf9b0949 diff --git a/qtserialport b/qtserialport index 0c988e14..b5f0519e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0c988e14a90f3e1579365dc3dc99fbdd02ac3d4c +Subproject commit b5f0519e8e6f8f125f711d61832072649d841dfe diff --git a/qtsvg b/qtsvg index 1787f95f..1fd6226d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1787f95f5727a20a4f0871736ad987fcfdf0f3c6 +Subproject commit 1fd6226d52b8d3d201b117902ff1ecd84cc1a1e5 diff --git a/qttools b/qttools index c66dc18b..38b62511 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c66dc18b37bf50d8b773089d161bccd286d4cd3a +Subproject commit 38b62511970b048b4a0edc5c8bcdea8c37fa76c7 diff --git a/qttranslations b/qttranslations index 446f2f8e..0bf644a0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 446f2f8e444362b393efe57904e178a20346e88f +Subproject commit 0bf644a075634ca49ee28c0f42566f1012506f31 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a94870b1..14f4ea59 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a94870b1583857ee5a485ce68369373efb3a9fdc +Subproject commit 14f4ea59491e40e7f95df9d7307433ef2c249ab5 diff --git a/qtwayland b/qtwayland index 6218661c..434f3e9a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6218661c89a5f9ee36785d187018b98855d7bab1 +Subproject commit 434f3e9a952b5858abc1f0ed1179ea5d2fca6a19 diff --git a/qtwebengine b/qtwebengine index db7187bb..b7e5722c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit db7187bb1420bcbdd933035451895372782ed7e1 +Subproject commit b7e5722cce95730004ef6cb9f4aabde5bbd5685d diff --git a/qtwinextras b/qtwinextras index e484402a..323fdf48 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e484402ad1d9b6d3b89333585b1ead97e4d21635 +Subproject commit 323fdf483f0021b7b3208cf2d35c0cb52248880a diff --git a/qtxmlpatterns b/qtxmlpatterns index 3bada53c..e4abf2c6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3bada53c09f226398bcdeddfd633fd6df7c42ff7 +Subproject commit e4abf2c6e3de158d3a6eb3c46b5158f741136c9d From 0e870f5594a39bdecdab4425b5e831bde8f21eda Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Apr 2018 11:51:39 +0200 Subject: [PATCH 03/19] Update submodules on '5.11.0' in qt5 Change-Id: I16b8e45bd4dff9470299aced9fdf5302878f61f8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qt3d b/qt3d index 6d73c51d..5eaa6dae 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6d73c51d44d10925a05804cd8e70978f155643df +Subproject commit 5eaa6dae7eccd6519149dd9869fe1fae9f73bc10 diff --git a/qtactiveqt b/qtactiveqt index c095e6ad..9f2d3d9c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c095e6ad6f5dbf7bb7082ab822aaa114f83ccc44 +Subproject commit 9f2d3d9c5cfd1a23e92f5eaafd3c6833202b48c7 diff --git a/qtbase b/qtbase index 2b5587d9..cf204590 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2b5587d901a0cc23749bf27a923d50bf0e5860d3 +Subproject commit cf204590ea94bb3a191b5e783471bd6f5a04ab8e diff --git a/qtcanvas3d b/qtcanvas3d index ff771b7d..9d555f6d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ff771b7d57eb3654f6321eb105129a594ec2841e +Subproject commit 9d555f6d21d013c990793aaaa23a5085529631a5 diff --git a/qtcharts b/qtcharts index d3f9275c..4f66d1ff 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d3f9275cbaa6a6059298ec248dd28dd6ef065e51 +Subproject commit 4f66d1ffeecd95b4bf6666b71536c42dea7450ed diff --git a/qtconnectivity b/qtconnectivity index e68b5e17..dc435c6c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e68b5e17b071ca11974474546be04c7d564eae3a +Subproject commit dc435c6ce0a6ecae776dc0dd032016453a0b4b56 diff --git a/qtdeclarative b/qtdeclarative index 6069cc1c..7bd77083 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6069cc1cd1a6309cdffeb8bdd9c4035f33742228 +Subproject commit 7bd77083032c6414f23b994617fb907be32f4d83 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index df80153b..80b9da7a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit df80153bf07b08e5d2ae8ba18f85a9ec15dbaef8 +Subproject commit 80b9da7ac42468453b7d130bd0a322a1312ad0e3 diff --git a/qtimageformats b/qtimageformats index b83a0a94..92e49329 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b83a0a9460432abb82218da247710a1aaf321336 +Subproject commit 92e49329edfb98c8b3f9cdcbaf116f0c601c7739 diff --git a/qtlocation b/qtlocation index 3d2281cc..ecb6fbd2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3d2281ccf7400a782f69b7b74cb45d0889708bcc +Subproject commit ecb6fbd235a8f23f0844bb2b926b78566c1aaa76 diff --git a/qtmultimedia b/qtmultimedia index bb7ffc4d..700e1aa6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bb7ffc4d847bb2b558693a4ca5d7f3a45c9b9231 +Subproject commit 700e1aa69744565b5327f6a5b185cffb9c9c149f diff --git a/qtpurchasing b/qtpurchasing index 02246cd6..607617ca 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 02246cd68ca14345d95cbd8893fd24ff60faa73f +Subproject commit 607617cacc1c6ced9fa3bbfb0cd24e115b623daa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c0232099..9b8338c2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c0232099a9fac03ef0f5287b6a26dbbd46669c06 +Subproject commit 9b8338c20236f705d1472c0a7c7244646369d58f diff --git a/qtremoteobjects b/qtremoteobjects index 55653936..11354178 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 556539365ab1eeaab339fc527c4c2130c2f804ff +Subproject commit 1135417853d83545a85dc2d283df388205a3609a diff --git a/qtscript b/qtscript index c2657d34..693f0320 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c2657d346455a5a7821fbfbe3b1107d7cf9b0949 +Subproject commit 693f0320e92cb1ab93f6261c72702432abdcb11d diff --git a/qtsensors b/qtsensors index 29f2041f..f39a9e10 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 29f2041f4da53815491affbf19ec008820c76e29 +Subproject commit f39a9e10671c0ba71c656e19101a53670b689627 diff --git a/qtserialbus b/qtserialbus index fb561e9a..de70bbb5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fb561e9aa52d24b0156dc2c3987216954ad52107 +Subproject commit de70bbb517839b552648d7590d240c3d2f7e646a diff --git a/qtsvg b/qtsvg index 1fd6226d..b1ca1bb7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1fd6226d52b8d3d201b117902ff1ecd84cc1a1e5 +Subproject commit b1ca1bb725fd8768782d8105b782932f95b70908 diff --git a/qttools b/qttools index 38b62511..1fa65804 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 38b62511970b048b4a0edc5c8bcdea8c37fa76c7 +Subproject commit 1fa658041cc44dd9b3fa7346dcc127bac9945c12 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 14f4ea59..0945042c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 14f4ea59491e40e7f95df9d7307433ef2c249ab5 +Subproject commit 0945042c5c8f78365b39b1528a25261e8c670b9d diff --git a/qtwayland b/qtwayland index 434f3e9a..7b4254ca 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 434f3e9a952b5858abc1f0ed1179ea5d2fca6a19 +Subproject commit 7b4254caccd3eee19d8116545d7022d1817e21fc diff --git a/qtwebengine b/qtwebengine index b7e5722c..df1d549c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b7e5722cce95730004ef6cb9f4aabde5bbd5685d +Subproject commit df1d549c56ff6a1214e566336f0c7dad2eacd503 diff --git a/qtwebsockets b/qtwebsockets index 34ce4b65..416ca205 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 34ce4b65ba35a487bdb8afa5e59b57cfa3f9b0e0 +Subproject commit 416ca205ed89d5edf8cc0e3bb32b404b38f9f2ee diff --git a/qtx11extras b/qtx11extras index d80236f5..e239c791 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d80236f50559f4fe785fba598a03aaa7f05d37ac +Subproject commit e239c7919f31798ef567498104bfeeae108b872d diff --git a/qtxmlpatterns b/qtxmlpatterns index e4abf2c6..17c45f32 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e4abf2c6e3de158d3a6eb3c46b5158f741136c9d +Subproject commit 17c45f3235f0bcb224379b0d1059c7669eb91487 From c5ddbdb86b837fcdd406d12e66d8193c991bdede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 24 Apr 2018 10:50:54 +0200 Subject: [PATCH 04/19] Update clang version to 6.0 The version also contains statically compiled libraries so we can ship qdoc without shipping libclang. The change temporarly removes CI qdoc builds from RHEL6 and MinGW, these two configurations are not used for packaging, just for CI testing. We should restore MinGW later. Task-number: QTBUG-66015 Task-number: QTBUG-67764 Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae Reviewed-by: Jesus Fernandez Reviewed-by: Fredrik de Vibe Reviewed-by: Simon Hausmann --- coin/provisioning/common/shared/sw_versions.txt | 2 +- coin/provisioning/common/unix/libclang.sh | 2 +- coin/provisioning/common/windows/libclang.ps1 | 8 ++++---- .../qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 12 ------------ .../qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 | 1 - 8 files changed, 9 insertions(+), 22 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh delete mode 100644 coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 diff --git a/coin/provisioning/common/shared/sw_versions.txt b/coin/provisioning/common/shared/sw_versions.txt index cc165dd5..fb2fecb9 100644 --- a/coin/provisioning/common/shared/sw_versions.txt +++ b/coin/provisioning/common/shared/sw_versions.txt @@ -1 +1 @@ -libclang_version="4.0" +libclang_version="6.0" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 7f29259e..53b9dfda 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -53,7 +53,7 @@ if [ $# -eq 0 ] echo "Using macOS defaults" version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z" - sha1="4781d154b274b2aec99b878c364f0ea80ff00a80" + sha1="10e48167b61726b20517172f8aff80fa1d9a379b" fi zip="libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index a8095ffe..745b61ed 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -24,7 +24,7 @@ function setURL() { if ( $toolchain -eq "vs2015" ) { if ( $archVer -eq 64 ) { - $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" + $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a" $destination = $baseDestination + "-64" setURL @@ -37,7 +37,7 @@ if ( $toolchain -eq "vs2015" ) { } $archVer=32 - $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" + $sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d" $destination = $baseDestination + "-32" setURL @@ -51,7 +51,7 @@ if ( $toolchain -eq "vs2015" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818" + $sha1 = "1233e6c008b90d89483df0291a597a0bac426d29" $destination = $baseDestination + "-64" setURL @@ -64,7 +64,7 @@ if ( $toolchain -eq "mingw" ) { } $archVer=32 - $sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3" + $sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933" $destination = $baseDestination + "-32" setURL diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh deleted file mode 100755 index 7d96209c..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/sw_versions.txt -. "$BASEDIR/../common/shared/sw_versions.txt" -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" -SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" - -"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index 49d4d4f5..e125a9e2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -5,6 +5,6 @@ BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" +SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh index dde7d702..1589b004 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh @@ -4,6 +4,6 @@ BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" +SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index b4155e86..53715dd4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -6,6 +6,6 @@ BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" +SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 deleted file mode 100644 index 375deed3..00000000 --- a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw From 5cc5f606a9197f59c31730e65995e27e4d606aab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Apr 2018 10:57:32 +0200 Subject: [PATCH 05/19] Update submodules on '5.11.0' in qt5 Change-Id: Ica9fca497f78dd4660118814acce3a4c2c0e68b7 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qt3d b/qt3d index 5eaa6dae..dcc7f154 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5eaa6dae7eccd6519149dd9869fe1fae9f73bc10 +Subproject commit dcc7f1548425c2a8cabad3282b98939f05cc2513 diff --git a/qtandroidextras b/qtandroidextras index b36bf0b3..5d54ecc1 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b36bf0b3eaa026e22a87865e106f54be6b520811 +Subproject commit 5d54ecc1c8e58d2339871141e6bd769f340c4e96 diff --git a/qtbase b/qtbase index cf204590..8863b8f2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cf204590ea94bb3a191b5e783471bd6f5a04ab8e +Subproject commit 8863b8f24fc0751d9b8015b7f1344f76942dbb82 diff --git a/qtconnectivity b/qtconnectivity index dc435c6c..43f06342 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dc435c6ce0a6ecae776dc0dd032016453a0b4b56 +Subproject commit 43f063427a3ffc62bd85237801b28c9f9826d562 diff --git a/qtdeclarative b/qtdeclarative index 7bd77083..fb027435 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7bd77083032c6414f23b994617fb907be32f4d83 +Subproject commit fb027435f597d55b9e72465036cb0daa2b272ec0 diff --git a/qtdoc b/qtdoc index 5aab2cac..77cc6211 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5aab2cac19ef2fbb241ca0bdc7c07388858ca0e1 +Subproject commit 77cc6211e853ec2b6deb4d07a3ef6e8907318376 diff --git a/qtgamepad b/qtgamepad index 313f2213..e1753479 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 313f221381507eee36c8e3bd0069b3e7962da140 +Subproject commit e175347926b2aa8be045aed485e09b99ae72f51c diff --git a/qtlocation b/qtlocation index ecb6fbd2..3a6335f1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ecb6fbd235a8f23f0844bb2b926b78566c1aaa76 +Subproject commit 3a6335f13aee6461b98375cea235a592456a5ce5 diff --git a/qtmacextras b/qtmacextras index fe8be8f4..80a8eb6c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit fe8be8f48cf384a2f1b0f7c03a83aaa81680151b +Subproject commit 80a8eb6cf546ba6a3b178c049f4f421fe6c8448b diff --git a/qtmultimedia b/qtmultimedia index 700e1aa6..b39c3918 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 700e1aa69744565b5327f6a5b185cffb9c9c149f +Subproject commit b39c391853245f8293d19431541eab20d78b8678 diff --git a/qtquickcontrols b/qtquickcontrols index 0689a825..88ff352d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0689a8256c0a21087c01fff3998fd3b606a5ac4c +Subproject commit 88ff352d5145b5761179ee42164a0bfcd4f1d54a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9b8338c2..60f3106b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9b8338c20236f705d1472c0a7c7244646369d58f +Subproject commit 60f3106b3fe537f1f26230bf0b59525cf98d6789 diff --git a/qtremoteobjects b/qtremoteobjects index 11354178..24fade01 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1135417853d83545a85dc2d283df388205a3609a +Subproject commit 24fade01e0e38acbf5ffdb9ffab712e8b7e86e30 diff --git a/qtscxml b/qtscxml index 67d48807..71a101b5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 67d48807b44735a2385b88db7ada01f7cd7eacfd +Subproject commit 71a101b5cbdbe9e32053ce61a5b6417a6990d780 diff --git a/qtsensors b/qtsensors index f39a9e10..b4e80891 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f39a9e10671c0ba71c656e19101a53670b689627 +Subproject commit b4e80891f3d51b3d6a7ead74c8650b84e0f070ea diff --git a/qtserialport b/qtserialport index b5f0519e..a9ada995 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b5f0519e8e6f8f125f711d61832072649d841dfe +Subproject commit a9ada995489b899cb938602308ffa1a8814acd2a diff --git a/qttools b/qttools index 1fa65804..d66075b0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1fa658041cc44dd9b3fa7346dcc127bac9945c12 +Subproject commit d66075b01d5211d12c0b3d796c4d2f3e8f88a2e9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0945042c..b92f0da2 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0945042c5c8f78365b39b1528a25261e8c670b9d +Subproject commit b92f0da2f8725ab529ec81c4e1b4b538e66258d2 diff --git a/qtwayland b/qtwayland index 7b4254ca..87621266 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7b4254caccd3eee19d8116545d7022d1817e21fc +Subproject commit 87621266ec66df5fc98cce165e5c80b7721983aa diff --git a/qtwebchannel b/qtwebchannel index 01241eb3..9800f7d1 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 01241eb3704af785e8d98fb2f6e223ca62a64175 +Subproject commit 9800f7d13e770e6409113e83f663ac4a419908a0 diff --git a/qtwebglplugin b/qtwebglplugin index 7bbbe5a8..62a5226c 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 7bbbe5a86779fd1ff55b07dbda433779f4aff6a7 +Subproject commit 62a5226c6147ee45f488a2e2c65870c1f836a5be diff --git a/qtwebsockets b/qtwebsockets index 416ca205..91bb60bb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 416ca205ed89d5edf8cc0e3bb32b404b38f9f2ee +Subproject commit 91bb60bba33a8c7df49835bfacfe9a8dc7381a1e diff --git a/qtwebview b/qtwebview index bb7dda99..87c95728 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit bb7dda99936b97cc262f07b25fcb500f8a552c8a +Subproject commit 87c9572897daf98f3c4177f6d6acd00bafcc70fd diff --git a/qtwinextras b/qtwinextras index 323fdf48..39e1314b 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 323fdf483f0021b7b3208cf2d35c0cb52248880a +Subproject commit 39e1314b23ff89c82dd762224076e7be6309de72 From d14d8f0cac68018a17ec4177d31dbc4dd0ea55a9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 28 Apr 2018 18:21:47 +0200 Subject: [PATCH 06/19] Update submodules on '5.11.0' in qt5 Change-Id: If2f1f76270195f337803ba302e46049acb015e3c Reviewed-by: Liang Qi --- qtdoc | 2 +- qtspeech | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtdoc b/qtdoc index 77cc6211..4833b19a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 77cc6211e853ec2b6deb4d07a3ef6e8907318376 +Subproject commit 4833b19a304292bb4039ec9c7862a665f7ecbeba diff --git a/qtspeech b/qtspeech index d8bd5329..b113bca7 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d8bd5329cd4000151051ed25cda005b3b51aec83 +Subproject commit b113bca742e01d3771f4f8ee0c5dc5ea5a97816e From 41369b628203a0400a5e81184b2aa38e44ab5350 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 30 Apr 2018 09:36:26 +0200 Subject: [PATCH 07/19] Install the MinGW build of libclang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This restores the MinGW installation of libclang on Windows 7 and installs the MSVC and MinGW builds in parallel on Windows 10. For compatibility reasons the MSVC installation is done last, to ensure that the older LLVM_INSTALL_DIR variable points to the MSVC installation. In addition though we now get LLVM_INSTALL_DIR_MINGW and LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the future. Task-number: QTBUG-66015 Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd Reviewed-by: Simo Fält --- coin/provisioning/common/windows/libclang.ps1 | 16 ++++++++++++---- .../qtci-windows-10-x86/08-libclang.ps1 | 2 ++ .../qtci-windows-10-x86_64/08-libclang.ps1 | 2 ++ .../qtci-windows-7-x86/08-libclang.ps1 | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 745b61ed..5ba0a0aa 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,6 +1,7 @@ param( [Int32]$archVer=32, - [string]$toolchain="vs2015" + [string]$toolchain="vs2015", + [bool]$setDefault=$true ) . "$PSScriptRoot\helpers.ps1" @@ -11,17 +12,19 @@ param( Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') - New-Variable -Name $var[0] -Value $var[1] + New-Variable -Name $var[0] -Value $var[1] -Force $libclang_version = $libclang_version -replace '["."]' } $zip = "c:\users\qt\downloads\libclang.7z" -$baseDestination = "C:\Utils\libclang-" + $libclang_version +$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain function setURL() { $script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" } +$toolchainSuffix = "" + if ( $toolchain -eq "vs2015" ) { if ( $archVer -eq 64 ) { $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a" @@ -47,6 +50,7 @@ if ( $toolchain -eq "vs2015" ) { Extract-7Zip $zip C:\Utils\ Rename-Item C:\Utils\libclang $destination Remove-Item -Force -Path $zip + $toolchainSuffix = "msvc" } if ( $toolchain -eq "mingw" ) { @@ -74,7 +78,11 @@ if ( $toolchain -eq "mingw" ) { Extract-7Zip $zip C:\Utils\ Rename-Item C:\Utils\libclang $destination Remove-Item -Force -Path $zip + $toolchainSuffix = "mingw" } -Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_") +if ( $setDefault ) { + Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_") +} +Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_") Write-Output "libClang = $libclang_version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 index 8da8cc5a..4d56d612 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 @@ -1 +1,3 @@ +# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015 diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 index f7a722d7..62f11292 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 @@ -1 +1,3 @@ +# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2015 diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 new file mode 100644 index 00000000..375deed3 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw From f5af9f119b2c97469ab3621f0c2ee7498920f5c4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 May 2018 03:01:28 +0300 Subject: [PATCH 08/19] Update submodules on '5.11' in qt5 Change-Id: I9e2f1fdb7f746a96d5e78889c1a77741ed9f116c Reviewed-by: Qt Submodule Update Bot Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtsvg | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index cce62153..cf5327ba 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cce62153d5394030d3fe74222e884d163247599e +Subproject commit cf5327ba621ec0842f980c995b97dad47eba210e diff --git a/qtbase b/qtbase index 9fdbd9dc..259648f8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9fdbd9dce917e90f0e644bedd8dca183f88304d6 +Subproject commit 259648f876b2092f7d28925ba4569ac8a5612ca8 diff --git a/qtconnectivity b/qtconnectivity index dc435c6c..ef332e4d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dc435c6ce0a6ecae776dc0dd032016453a0b4b56 +Subproject commit ef332e4deedc914fe33bab68107f902182e03356 diff --git a/qtdeclarative b/qtdeclarative index 8e98b175..f9686bc6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8e98b175fa9fc896b0372ec814ee6600116a027b +Subproject commit f9686bc68696ad1e99a0587f15d05300d003d990 diff --git a/qtdoc b/qtdoc index e2a103e0..9d0fdb77 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e2a103e0904b6d9a29fcf8e0d92560941265e7db +Subproject commit 9d0fdb77b11566226e46e7913dd0f4f32ce9f92b diff --git a/qtmultimedia b/qtmultimedia index 8aaf91f2..860f458d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8aaf91f29933bf652ef6dc0215dea1f278b1f858 +Subproject commit 860f458ddb1fac8fc003d2ec46b0209a1e0dbeda diff --git a/qtsvg b/qtsvg index 1fd6226d..0279e65c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1fd6226d52b8d3d201b117902ff1ecd84cc1a1e5 +Subproject commit 0279e65c25b22066d15752267a6b5d1ba660e7d9 From c7562fa8ef8f0d01709527238f4c53669e1e53ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 26 Feb 2018 09:18:55 +0200 Subject: [PATCH 09/19] Take proxy into use in python provisioning in windows Task-number: QTQAINFRA-1669 Change-Id: I2030f244da65e4fd0c3b0be54d941b065f9a180e Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/helpers.ps1 | 4 ++-- coin/provisioning/common/windows/python.ps1 | 11 ++++++----- coin/provisioning/common/windows/python3.ps1 | 11 ++++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index a2535b25..8a4b452e 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -117,10 +117,10 @@ function Is64BitWinHost return [environment]::Is64BitOperatingSystem } -function isProxyEnabled { +function IsProxyEnabled { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable } -function getProxy { +function Get-Proxy { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer } diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 28881d58..05811c58 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -64,10 +64,11 @@ Add-Path "C:\Python27;C:\Python27\Scripts" Run-Executable "C:\Python27\python.exe" "-m ensurepip" # Install python virtual env -#if (isProxyEnabled) { -# Write-Host "Using proxy with pip" -# $pip_args = "--proxy=" + (getProxy) -#} -Run-Executable "C:\Python27\Scripts\pip.exe" "install virtualenv" +if (IsProxyEnabled) { + $proxy = Get-Proxy + Write-Host "Using proxy ($proxy) with pip" + $pip_args = "--proxy=$proxy" +} +Run-Executable "C:\Python27\Scripts\pip.exe" "$pip_args install virtualenv" Write-Output "Python = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index cd5c8348..d5d5998a 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -65,11 +65,12 @@ Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" # Install python virtual env -#if (isProxyEnabled) { -# Write-Host "Using proxy with pip" -# $pip_args = "--proxy=" + (getProxy) -#} -Run-Executable "$install_path\Scripts\pip3.exe" "install virtualenv" +if (IsProxyEnabled) { + $proxy = Get-Proxy + Write-Host "Using proxy ($proxy) with pip" + $pip_args = "--proxy=$proxy" +} +Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv" Write-Output "Python3 = $version" >> ~/versions.txt From b1c3eeb2135a235c0c03c6a1352bfb8f90a47eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 26 Feb 2018 10:16:57 +0200 Subject: [PATCH 10/19] Fix styles in setting proxy Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c Reviewed-by: Oliver Wolff Reviewed-by: Heikki Halmet --- coin/provisioning/common/shared/http_proxy.txt | 2 +- coin/provisioning/common/windows/set-proxy.ps1 | 2 +- coin/provisioning/common/windows/unset-proxy.ps1 | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/shared/http_proxy.txt b/coin/provisioning/common/shared/http_proxy.txt index 3aa6ceba..88d0e630 100644 --- a/coin/provisioning/common/shared/http_proxy.txt +++ b/coin/provisioning/common/shared/http_proxy.txt @@ -1,2 +1,2 @@ -proxy="http://proxy.intra.qt.io:3128" +proxy=http://proxy.intra.qt.io:3128 diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 index 23c0e6aa..08d6a204 100644 --- a/coin/provisioning/common/windows/set-proxy.ps1 +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -35,7 +35,7 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] -if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) { +if ([string]::IsNullOrEmpty($proxy)) { Write-Host "No proxy is defined." } else { Write-Host "Checking proxy @ $proxy" diff --git a/coin/provisioning/common/windows/unset-proxy.ps1 b/coin/provisioning/common/windows/unset-proxy.ps1 index d0a374ef..9c3dddb3 100644 --- a/coin/provisioning/common/windows/unset-proxy.ps1 +++ b/coin/provisioning/common/windows/unset-proxy.ps1 @@ -32,6 +32,8 @@ ############################################################################# Write-Host "Disabling proxy" +# A bit-mask is needed to disable "Automatically detect settings" from LAN +# settings that disturb and re-enable proxy even after disabling it. $dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections").DefaultConnectionSettings $dcs[8] = $_ -band 0xF7 Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs From 80b8954591bdfba0dec5a6926435351e26469717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 19 Apr 2018 15:34:00 +0300 Subject: [PATCH 11/19] Update openssl packages to 1.0.2o Change-Id: Iab7043212cc3b66c26100519d95ac18fc69fa26a Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/openssl_for_android_linux.sh | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 4 ++-- coin/provisioning/common/windows/openssl.ps1 | 6 +++--- coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index ed91c5ab..353722f2 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2g" +version="1.0.2o" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" installFolder="/home/qt/" -sha="36af23887402a5ea4ebef91df8e61654906f58f2" +sha="a47faaca57b47a0d9d5fb085545857cc92062691" # Until every VM doing Linux Android builds have provisioned the env variable # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. # QTQAINFRA-1436 @@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" tar -xzf "$targetFile" -C "$installFolder" # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}g" "${opensslHome}" +mv "${opensslHome}o" "${opensslHome}" pushd "$opensslHome" echo "Running configure" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 1131841a..53c2ee17 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -39,9 +39,9 @@ # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.0.2j" +$version = "1.0.2o" $zip = "c:\users\qt\downloads\openssl-$version.tar.gz" -$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" +$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691" $destination = "C:\Utils\openssl-android-master" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index c884dd94..50bee891 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_0_2j" +$version = "1_0_2o" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" + $sha1 = "86c71a28eda53fa406b957dd37491d616344b464" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" +$sha1 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index a68704f9..8532f99a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -opensslVersion="1.0.2k" +opensslVersion="1.0.2o" opensslFile="openssl-$opensslVersion.tar.gz" opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44" +opensslSha1="a47faaca57b47a0d9d5fb085545857cc92062691" # Below target location has been hard coded into Coin. # QTQAINFRA-1195 From c740458cd8d2e73866038d73900873ba7fe32651 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 May 2018 03:01:54 +0300 Subject: [PATCH 12/19] Update submodules on '5.11' in qt5 Change-Id: I3d5244647a09a02ed54879e3a79dbce7daa65460 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 2831c495..974c9042 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2831c495233338403b31348393e785055700541b +Subproject commit 974c904270fea2bf53f500794c56ca84324de4d8 diff --git a/qtbase b/qtbase index 259648f8..e5b54845 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 259648f876b2092f7d28925ba4569ac8a5612ca8 +Subproject commit e5b5484598d97fa8fac22b8f4893d9ade370a153 diff --git a/qtcharts b/qtcharts index 1448df49..cb1d6e0e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1448df4988763d163b6753f9afddbec7999aedd8 +Subproject commit cb1d6e0e8be5008cb81a4be897a7424b98db6676 diff --git a/qtdeclarative b/qtdeclarative index f9686bc6..717b57a9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f9686bc68696ad1e99a0587f15d05300d003d990 +Subproject commit 717b57a9aae4c6d45cbcf91d390e42af56ab8061 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bc933339..1274fa1f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bc93333958e469e2bd79319befb23328a9de38a9 +Subproject commit 1274fa1f799db688b7acdfac216c54cd3dc277f3 diff --git a/qtwebengine b/qtwebengine index ff0a83a6..3e746644 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ff0a83a6c3e64772276cb71cba0392d1e89b037f +Subproject commit 3e746644c6703a522d5658fc90dde721b4466d5b diff --git a/qtxmlpatterns b/qtxmlpatterns index 1a254ab1..fc12d705 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1a254ab116f63b8188b9bc12cdd19e6d5696c3f2 +Subproject commit fc12d7056610895ef7c67004eaf521509208db40 From ab7772a73d3fdd123be1a203cd5d1feb617b74ca Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 May 2018 13:28:47 +0200 Subject: [PATCH 13/19] Update submodules on '5.11.0' in qt5 Change-Id: I37be73eba9442b56b5f7147e7d69b98ce464b44d Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 8863b8f2..a7863a58 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8863b8f24fc0751d9b8015b7f1344f76942dbb82 +Subproject commit a7863a58545a6c59eaf16f36905efcbf0e4f94f9 diff --git a/qtdeclarative b/qtdeclarative index fb027435..1e82f116 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fb027435f597d55b9e72465036cb0daa2b272ec0 +Subproject commit 1e82f11629e5572783e5bfc36f24ad10c235ca53 diff --git a/qtdoc b/qtdoc index 4833b19a..63f18077 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4833b19a304292bb4039ec9c7862a665f7ecbeba +Subproject commit 63f18077b2e8b4045c92248e86ed1ee2122cbd75 diff --git a/qtlocation b/qtlocation index 3a6335f1..3a03829c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3a6335f13aee6461b98375cea235a592456a5ce5 +Subproject commit 3a03829cb854c299da220a073cae58614d72c5cb diff --git a/qttools b/qttools index d66075b0..9894e604 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d66075b01d5211d12c0b3d796c4d2f3e8f88a2e9 +Subproject commit 9894e604dff2bf9fe9961b475a678938316154f1 diff --git a/qtwebengine b/qtwebengine index df1d549c..c2736db6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit df1d549c56ff6a1214e566336f0c7dad2eacd503 +Subproject commit c2736db6ac32a8169978def59748f61365468b3c From 8cd324b216118080884a25831cd87436f38395b0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 4 May 2018 16:26:06 +0200 Subject: [PATCH 14/19] Update submodules on '5.11.0' in qt5 Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f Reviewed-by: Liang Qi --- qt3d | 2 +- qtlocation | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index dcc7f154..43cebede 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dcc7f1548425c2a8cabad3282b98939f05cc2513 +Subproject commit 43cebede39c9340c29bad6c6a78b76446d54c0db diff --git a/qtlocation b/qtlocation index 3a03829c..13941457 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3a03829cb854c299da220a073cae58614d72c5cb +Subproject commit 139414573ab27bd1df1b491aeb6003a6fc0d3d5d From 4d9ab7c72c6f78c159208148f8cd46bdfceb136f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 5 May 2018 03:02:21 +0300 Subject: [PATCH 15/19] Update submodules on '5.11' in qt5 Change-Id: I29efdec1b59ea7703481840aaaf4220778eace13 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 974c9042..481b9755 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 974c904270fea2bf53f500794c56ca84324de4d8 +Subproject commit 481b975584d65b6dd75efceac284b02a79e6a37e diff --git a/qtbase b/qtbase index e5b54845..43ea15d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e5b5484598d97fa8fac22b8f4893d9ade370a153 +Subproject commit 43ea15d01cd491639d8cb5eb85da066f5d0a8571 diff --git a/qtconnectivity b/qtconnectivity index ef332e4d..8bf07027 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ef332e4deedc914fe33bab68107f902182e03356 +Subproject commit 8bf0702792f2d41764e62b63432870fee6a9e9c7 diff --git a/qtdoc b/qtdoc index 9d0fdb77..b9a083c1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9d0fdb77b11566226e46e7913dd0f4f32ce9f92b +Subproject commit b9a083c14f6cdd54f59081cd40f2cd2d39321af6 diff --git a/qtlocation b/qtlocation index d4483812..255e58fe 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d44838125389720e4352dd51ad1da02f4cb58dc8 +Subproject commit 255e58fe67885dc47e25e685ac3666c514d60740 diff --git a/qtmultimedia b/qtmultimedia index 860f458d..5b7bd00d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 860f458ddb1fac8fc003d2ec46b0209a1e0dbeda +Subproject commit 5b7bd00d2c03f7035b21534003662e931bd04eb8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1274fa1f..bf39c3ce 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1274fa1f799db688b7acdfac216c54cd3dc277f3 +Subproject commit bf39c3ce5524d151532d89efef40ff1a8e25f4c0 diff --git a/qtwebengine b/qtwebengine index 3e746644..9b03a98f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3e746644c6703a522d5658fc90dde721b4466d5b +Subproject commit 9b03a98ffb807f49d1e79fffad141a3634474d8a From 39a109c884dc2f1c48cad455717a4607b7a39fd6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 May 2018 03:01:15 +0300 Subject: [PATCH 16/19] Update submodules on '5.11' in qt5 Change-Id: Ibfe4750bb82679e1a0366c77d74ef9491b642212 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtmultimedia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 43ea15d0..f72777b9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 43ea15d01cd491639d8cb5eb85da066f5d0a8571 +Subproject commit f72777b969bd74a1472ce8f028da01a82200d656 diff --git a/qtmultimedia b/qtmultimedia index 5b7bd00d..370c4803 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5b7bd00d2c03f7035b21534003662e931bd04eb8 +Subproject commit 370c48039bfa0fe4325852358d603cf4438c3f47 From 1989bc105d4a0a154e252ea438f30ea2894f998c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 May 2018 20:55:13 +0200 Subject: [PATCH 17/19] Update submodules on '5.11' in qt5 Change-Id: I0922b0b730ec0abd02d5940fdf6b3e7b1162baba Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtspeech | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index 481b9755..7eb41022 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 481b975584d65b6dd75efceac284b02a79e6a37e +Subproject commit 7eb41022f19a57505c8eef3497ad6710fc92bd7d diff --git a/qtbase b/qtbase index f72777b9..1b7337d2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f72777b969bd74a1472ce8f028da01a82200d656 +Subproject commit 1b7337d23dbc767ba482d9051180f10d77052913 diff --git a/qtdeclarative b/qtdeclarative index 717b57a9..6a02e880 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 717b57a9aae4c6d45cbcf91d390e42af56ab8061 +Subproject commit 6a02e8801c71d8008c5b4db922a736c358fee00e diff --git a/qtmultimedia b/qtmultimedia index 370c4803..a0049de1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 370c48039bfa0fe4325852358d603cf4438c3f47 +Subproject commit a0049de16d9e2a92b8d31b1ee6943c994ffdf7d2 diff --git a/qtspeech b/qtspeech index da77ce98..d0494c3b 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit da77ce9802200cc6dd47268172f60a60bd1310d1 +Subproject commit d0494c3b3842ef77be355e764c1ba17f369d3278 From b1b04fcb1aa2f2cd55db258ac30824260485d25a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 May 2018 14:59:40 +0300 Subject: [PATCH 18/19] Update submodules on '5.11.0' in qt5 Change-Id: Ia6d3ee44db368765612cea543952878499889d6b Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index 43cebede..15e86351 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 43cebede39c9340c29bad6c6a78b76446d54c0db +Subproject commit 15e863517ea37ca7ba6bcb75b078272eddbc5d37 diff --git a/qtserialbus b/qtserialbus index de70bbb5..c66a364c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit de70bbb517839b552648d7590d240c3d2f7e646a +Subproject commit c66a364cf34b4945208f07362deabe0020e5b596 diff --git a/qtwebengine b/qtwebengine index c2736db6..28e03202 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c2736db6ac32a8169978def59748f61365468b3c +Subproject commit 28e0320235d33f00c6c141a549dc0553ee0043a5 From f5ef436426990a56585adab2b939d2b6a083e0ca Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 May 2018 22:15:02 +0200 Subject: [PATCH 19/19] Update submodules on '5.11' in qt5 Change-Id: I7020e4048d61eec71f931da3fc12da2613d3dab8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/qt3d b/qt3d index 7eb41022..66feeb8d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7eb41022f19a57505c8eef3497ad6710fc92bd7d +Subproject commit 66feeb8de70291786499b3008ab8fded4043172a diff --git a/qtactiveqt b/qtactiveqt index cf5327ba..2045c0fa 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cf5327ba621ec0842f980c995b97dad47eba210e +Subproject commit 2045c0fa98445ee185822579c06e610afa3477ba diff --git a/qtandroidextras b/qtandroidextras index b36bf0b3..82a912b6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b36bf0b3eaa026e22a87865e106f54be6b520811 +Subproject commit 82a912b656070bb2fd4575f6550f31f25d9c89a1 diff --git a/qtbase b/qtbase index 1b7337d2..fae53562 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b7337d23dbc767ba482d9051180f10d77052913 +Subproject commit fae53562ae23ac99621c1987522015c0da59e374 diff --git a/qtcanvas3d b/qtcanvas3d index ff771b7d..73fba685 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ff771b7d57eb3654f6321eb105129a594ec2841e +Subproject commit 73fba685d9f725fc0c9cf4f631371aa63a7b77a7 diff --git a/qtcharts b/qtcharts index cb1d6e0e..213a9c30 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cb1d6e0e8be5008cb81a4be897a7424b98db6676 +Subproject commit 213a9c307dfef2209d217cb539554535c78f5003 diff --git a/qtconnectivity b/qtconnectivity index 8bf07027..f4157c60 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8bf0702792f2d41764e62b63432870fee6a9e9c7 +Subproject commit f4157c6062f06c453fcf59d54c1bfd649ce45fab diff --git a/qtdatavis3d b/qtdatavis3d index 6c253768..8f049132 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 6c253768e2fb6c0892215f3d93f36be7cece637e +Subproject commit 8f0491327a24172b55b80adf491c983d141ec777 diff --git a/qtdeclarative b/qtdeclarative index 6a02e880..accc75e0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6a02e8801c71d8008c5b4db922a736c358fee00e +Subproject commit accc75e06e6fd65b166df994ec52fecd5b8c3f2f diff --git a/qtdoc b/qtdoc index b9a083c1..1c26dd6c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b9a083c14f6cdd54f59081cd40f2cd2d39321af6 +Subproject commit 1c26dd6cb5e5cd016fa4bb4b14914993b1450565 diff --git a/qtgamepad b/qtgamepad index 313f2213..32ce7e8a 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 313f221381507eee36c8e3bd0069b3e7962da140 +Subproject commit 32ce7e8af9be26408983b4fb7cf03f9684360954 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index df80153b..ae969362 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit df80153bf07b08e5d2ae8ba18f85a9ec15dbaef8 +Subproject commit ae9693620ebb61c7f7384623527b1e2780068b95 diff --git a/qtimageformats b/qtimageformats index b83a0a94..92398950 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b83a0a9460432abb82218da247710a1aaf321336 +Subproject commit 92398950d9cfe5a88cb685ec166eb413aa8613ec diff --git a/qtlocation b/qtlocation index 255e58fe..cad3ffc8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 255e58fe67885dc47e25e685ac3666c514d60740 +Subproject commit cad3ffc8c90f3c194d06e52c981cd54cdab509ec diff --git a/qtmacextras b/qtmacextras index fe8be8f4..3a27add9 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit fe8be8f48cf384a2f1b0f7c03a83aaa81680151b +Subproject commit 3a27add9f6d2b4e7065d902274bbf68791ca2f69 diff --git a/qtmultimedia b/qtmultimedia index a0049de1..075aa60b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a0049de16d9e2a92b8d31b1ee6943c994ffdf7d2 +Subproject commit 075aa60b0ff37300c7ed2cb07372d2c747cd6dfc diff --git a/qtpurchasing b/qtpurchasing index 02246cd6..0ff95d8a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 02246cd68ca14345d95cbd8893fd24ff60faa73f +Subproject commit 0ff95d8a8994babfa8f9527d507ff0dd5a6dbed5 diff --git a/qtquickcontrols b/qtquickcontrols index 0689a825..b4ba5d36 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0689a8256c0a21087c01fff3998fd3b606a5ac4c +Subproject commit b4ba5d36f46c61af4f8f6cdf07246fb5a63aedb5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bf39c3ce..d926bce8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bf39c3ce5524d151532d89efef40ff1a8e25f4c0 +Subproject commit d926bce841797a88b972ada10f27126a1fa65738 diff --git a/qtremoteobjects b/qtremoteobjects index 7fe4bc5c..61e12ed7 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7fe4bc5c19f519b3adf7209a37e3d8e5cc1e214d +Subproject commit 61e12ed7e2ab140c04860d1278f3492afe3d27fe diff --git a/qtscript b/qtscript index c2657d34..3813b620 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c2657d346455a5a7821fbfbe3b1107d7cf9b0949 +Subproject commit 3813b6205b3519fc3372d0e6a8073d2fb82a6145 diff --git a/qtscxml b/qtscxml index 67d48807..c1fa4d09 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 67d48807b44735a2385b88db7ada01f7cd7eacfd +Subproject commit c1fa4d09d7208ba482b513bfc72e49399b0c419c diff --git a/qtsensors b/qtsensors index f39a9e10..e8926f54 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f39a9e10671c0ba71c656e19101a53670b689627 +Subproject commit e8926f541f38a776a81355f64637b4f520159206 diff --git a/qtserialbus b/qtserialbus index fb561e9a..9e98521e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fb561e9aa52d24b0156dc2c3987216954ad52107 +Subproject commit 9e98521e3dfd2d96d5e0e160b74bb7059aa59dee diff --git a/qtserialport b/qtserialport index b5f0519e..7b8f4c83 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b5f0519e8e6f8f125f711d61832072649d841dfe +Subproject commit 7b8f4c839de016d5bf6bec1389655b7cad3b6533 diff --git a/qtsvg b/qtsvg index 0279e65c..14205cb5 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0279e65c25b22066d15752267a6b5d1ba660e7d9 +Subproject commit 14205cb57c9b8464e299dba06d4c3d094902400b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 72f846f7..ebb6c180 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 72f846f7b5ce0495d64af210e13f41690eff8205 +Subproject commit ebb6c180bef3156cfe2d2df134e5d1bdf0f771b8 diff --git a/qtwayland b/qtwayland index 51472970..bb02115f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 51472970ce519fb39f492238b879d67ad9505f28 +Subproject commit bb02115ff1c23289264b077d7d24b723fd9d339a diff --git a/qtwebchannel b/qtwebchannel index 01241eb3..83eab9fd 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 01241eb3704af785e8d98fb2f6e223ca62a64175 +Subproject commit 83eab9fd3cf3745340b18db961fcec45f4f80195 diff --git a/qtwebengine b/qtwebengine index 9b03a98f..f8898170 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9b03a98ffb807f49d1e79fffad141a3634474d8a +Subproject commit f8898170a77593e314d3cd187f259223e9bff0f8 diff --git a/qtwebglplugin b/qtwebglplugin index 8bbe7450..d89846b8 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 8bbe7450759417082efce6ff57e8f0e490a247f2 +Subproject commit d89846b8ad6cc0b662820ba8666fddd9a08be4ff diff --git a/qtwebsockets b/qtwebsockets index 416ca205..9b6f7ca6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 416ca205ed89d5edf8cc0e3bb32b404b38f9f2ee +Subproject commit 9b6f7ca6512699af41cc602d2092c230612fe78e diff --git a/qtwebview b/qtwebview index bb7dda99..487e0166 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit bb7dda99936b97cc262f07b25fcb500f8a552c8a +Subproject commit 487e0166e1c15cc0e068fa17c00757ae260dccc1 diff --git a/qtwinextras b/qtwinextras index 323fdf48..0a143e86 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 323fdf483f0021b7b3208cf2d35c0cb52248880a +Subproject commit 0a143e866e0663a06cd58f8db8d2e0f29ae28afe diff --git a/qtx11extras b/qtx11extras index d80236f5..5650412f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d80236f50559f4fe785fba598a03aaa7f05d37ac +Subproject commit 5650412fee0a3b96936330eba4b3f1c0fa5dae41 diff --git a/qtxmlpatterns b/qtxmlpatterns index fc12d705..c69beb78 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fc12d7056610895ef7c67004eaf521509208db40 +Subproject commit c69beb789b20945e4d5796769204ae940da6983c