From 24e1a15d40c02d5cd47644d37f713182830dfb4f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2018 14:07:13 +0200 Subject: [PATCH 01/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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 ab7772a73d3fdd123be1a203cd5d1feb617b74ca Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 May 2018 13:28:47 +0200 Subject: [PATCH 08/10] 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 09/10] 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 b1b04fcb1aa2f2cd55db258ac30824260485d25a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 May 2018 14:59:40 +0300 Subject: [PATCH 10/10] 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