From a268fb46895f694a58da2389fd47ca393a68deef Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 29 Jul 2019 14:26:43 +0200 Subject: Adjust submodule branches Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6addc7..1aa79a80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.13 + branch = 5.13.1 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.13 + branch = 5.13.1 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.13 + branch = 5.13.1 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.13 + branch = 5.13.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.13 + branch = 5.13.1 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,86 +229,86 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.13 + branch = 5.13.1 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.13 + branch = 5.13.1 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.13 + branch = 5.13.1 status = preview -- cgit v1.2.1 From 2b738468de025372806b32e23883454767bee3f9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Aug 2019 11:50:33 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index 7e60b6d5..e1f988f4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7e60b6d599db9d4b18db3fe050d9f53ccb3125c1 +Subproject commit e1f988f4363bcd69f1d0d47cef82503938c5638b diff --git a/qtactiveqt b/qtactiveqt index 6746b4c3..8168e8c7 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6746b4c3736eb08721e68f3a051bf27b699487f3 +Subproject commit 8168e8c7447a9889554a587ba8c78fc7ba716eb8 diff --git a/qtandroidextras b/qtandroidextras index c158f8d5..9cc4df84 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c158f8d5179957084fd7ec1c2f97086b45604f56 +Subproject commit 9cc4df84fa778aeac0c391064fffc8b018c8f5c2 diff --git a/qtbase b/qtbase index 28af6e97..4f116f00 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 28af6e97e5fe7f844bc85df7af22ce8b7414f5a6 +Subproject commit 4f116f00fcd93decbf6fc01b61b0be7c293d3c39 diff --git a/qtcharts b/qtcharts index aa765c1b..0bebc937 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit aa765c1b7802746e6a97043b62a142eb2d2137af +Subproject commit 0bebc937ce87bf28d815444e720e17619c916a91 diff --git a/qtconnectivity b/qtconnectivity index 96dd4e7f..37cd27fa 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 96dd4e7ff0b10ac79798f1ae63db716bcc199e87 +Subproject commit 37cd27fac015d8d3b823321a2e2f04826ea844b4 diff --git a/qtdatavis3d b/qtdatavis3d index 3206729a..ddc28d06 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3206729aa704d9c7cdfaa734f177334d5c11ae72 +Subproject commit ddc28d060d2ae05f221d779bdd04e18f282aa090 diff --git a/qtdeclarative b/qtdeclarative index aeec2f94..6c19dd89 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aeec2f94c376c9a0e84bbbb3be4652384c7da113 +Subproject commit 6c19dd8989895b29a3f0b46871ed5f360e7b3440 diff --git a/qtdoc b/qtdoc index 6fbbbfd6..03ba767b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6fbbbfd69274507eae820959bd187c7b565e9d4a +Subproject commit 03ba767b36789489f46cce1ca19219dd409fbb74 diff --git a/qtgamepad b/qtgamepad index 027a1dfd..28385f28 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 027a1dfd3eca382dab3f3f17e7f43ccb84e329be +Subproject commit 28385f28cbe11d367e78b497625bb8a282cd4bd4 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3b3b3f85..52d3083d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3b3b3f85ddd472bdae168f210e62dc2868997aae +Subproject commit 52d3083d3ac1154414245187ad5bcc65d69c0145 diff --git a/qtimageformats b/qtimageformats index adc70a52..efe5998c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit adc70a5244a8a7c3d554cbcfc3f38f8396974900 +Subproject commit efe5998c3d9121e18660f3105b9ae144c3232ff5 diff --git a/qtmacextras b/qtmacextras index f44061fa..0e854fa1 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f44061fa0547d048661d1efa8444da7c757fa39c +Subproject commit 0e854fa114aec06c3d77b19d5c2712154cdc2c33 diff --git a/qtmultimedia b/qtmultimedia index dbdcc1b0..2da4e162 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dbdcc1b099dc25ffb707a2441191463de33c51f3 +Subproject commit 2da4e162516830f4976f30c789a3fd9511dde932 diff --git a/qtnetworkauth b/qtnetworkauth index c2bf9b42..d7931d73 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c2bf9b420f29e4b001d6f85b918be5fb89c87564 +Subproject commit d7931d733e679c00c313ecff89052ed59bf49c30 diff --git a/qtpurchasing b/qtpurchasing index a0f911a2..6ef05a39 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit a0f911a29eb055de1e9dc2d3e78a1f03ccead5da +Subproject commit 6ef05a39b1ac00496ead66c8e143a05078e148e8 diff --git a/qtqa b/qtqa index 21586570..da16b930 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 21586570419b9cace4b9402f757a77fbfc3e9976 +Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f diff --git a/qtquickcontrols b/qtquickcontrols index 845cd17a..8f4eb455 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 845cd17a498d6008992b04ec4ca1984e6e73de3c +Subproject commit 8f4eb455f93fa582a041c49595903eed81c59924 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 200b4751..7c2ec7dc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 200b47519ffc61ebd06cda9a4c452d7b15e37d33 +Subproject commit 7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee diff --git a/qtremoteobjects b/qtremoteobjects index 6ccba37d..ff2c16f4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6ccba37dedcb37507fd1ab3c72e576c0b005e572 +Subproject commit ff2c16f4acfb3b59a3b1b7aa0d4b1f361b026ba8 diff --git a/qtrepotools b/qtrepotools index da0a7744..9d734113 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit da0a7744065b2c1cc7660f4fcf6d9e253f490eca +Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 diff --git a/qtscript b/qtscript index 91234654..fbf37dd7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 912346548c774cdcc4383cc30e06f106dbf77a97 +Subproject commit fbf37dd7fa79509aec1d202c77331b0c4114488a diff --git a/qtsensors b/qtsensors index 6390e165..4c65318c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6390e165dc2df3bc48c3655ed45d1b952d1f2bae +Subproject commit 4c65318cd544980524aa600f4b4e3f97e6b46e0b diff --git a/qtserialbus b/qtserialbus index 5d82bf36..bf3fe510 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 5d82bf36c526d55951127c95d8c0aa5abc2e199d +Subproject commit bf3fe5100df93369997aa9bf3f9ca71c3a908cca diff --git a/qtserialport b/qtserialport index 335f1d02..5faf8cc2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 335f1d02dc134bf11277c0573553c7c838cc6a9f +Subproject commit 5faf8cc2ea0f757327c23e086caa6309eebeaec3 diff --git a/qtspeech b/qtspeech index aa450db4..d3d2777f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit aa450db462db5fca847ed05c1e05c1779161cc8b +Subproject commit d3d2777fc868761609ef121ba3e88a20eb11df2b diff --git a/qttools b/qttools index 6d19911c..6a04f888 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6d19911c0db508a1c0079890a0adc8f6ab87bcf7 +Subproject commit 6a04f888b7bece2b4276ba6d55073c06e8d4f652 diff --git a/qtwebchannel b/qtwebchannel index c5d4f9b1..81b39fbe 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit c5d4f9b1a653a242b6231cbdea8ccfc751180beb +Subproject commit 81b39fbe9eb4dbfff34ff9c3e6017eea12bf76ce diff --git a/qtwebglplugin b/qtwebglplugin index 95957bbe..27495743 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 95957bbecc40e5efb163ab123c2a7d8d04005bef +Subproject commit 27495743080cbf0ff7fef2f83f82362d147ae519 diff --git a/qtwebsockets b/qtwebsockets index 0634c810..e406bf83 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0634c8104558dbb7acd314d52cf4b039c8c3689d +Subproject commit e406bf83a963cb1efae6a5869fc5a2a62249a6cf diff --git a/qtwebview b/qtwebview index 5c80bba0..13dfe272 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5c80bba07d09f498027586a32b0f937d26cca1dd +Subproject commit 13dfe272a387a2f56229df916a580ab9ac92e332 diff --git a/qtwinextras b/qtwinextras index da9ce653..07f43f05 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit da9ce653ee04b9b93cfa95d4d7071d0153286c71 +Subproject commit 07f43f05d3ed8e54e4a62b20b958644f58fab7fc diff --git a/qtx11extras b/qtx11extras index d6090610..839e33dc 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d6090610969cd7f2f5554e6239b0e35f8755196a +Subproject commit 839e33dc17d24ec41bb95b76ef6ed208d8f4f492 diff --git a/qtxmlpatterns b/qtxmlpatterns index 84e44bf5..04e770cf 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 84e44bf5a9e5dcb0f93c55129f565e34edb7dd1a +Subproject commit 04e770cfbafa16c09dd527897bfac2a457b47644 -- cgit v1.2.1 From f511a2d74ff298989d48a1ee409b0de1e4d21869 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Aug 2019 12:10:20 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650 Reviewed-by: Liang Qi --- qt3d | 2 +- qtlottie | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index e1f988f4..b9e24eee 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e1f988f4363bcd69f1d0d47cef82503938c5638b +Subproject commit b9e24eee0f43061730445e5400aa6a5795774660 diff --git a/qtlottie b/qtlottie index 4c3207a7..86c7306e 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 4c3207a7385a3ba402884bb50136bbe7b70baa2e +Subproject commit 86c7306ebc0d011a096f0554e0c206fe17bb577c diff --git a/qtqa b/qtqa index da16b930..5e3b8ac7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit da16b930f44d59cefc736b5439b73e1aaa19700f +Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 diff --git a/qttools b/qttools index 6a04f888..f4a51bac 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6a04f888b7bece2b4276ba6d55073c06e8d4f652 +Subproject commit f4a51baca04fdaa0fc6a1106db9f7dd91b5a3b2a -- cgit v1.2.1 From f08bd26eebe928b86cb1819126c232af02e10ab5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Aug 2019 23:31:00 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 309c3139..6388eb98 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 309c3139f8111ea246dd3a1f996578d0b35bb151 +Subproject commit 6388eb98a12a639a263ef34553269fc36b582269 diff --git a/qtbase b/qtbase index 3d7bd7ad..36cc171b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3d7bd7ad19254bb1c4794349e71501e58c91891e +Subproject commit 36cc171b9314bf77fc84d4273dceb6264aef7134 diff --git a/qtconnectivity b/qtconnectivity index c9d585da..406b18fd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c9d585da2ddd49108d7b56f480bcfc9d71b67dbf +Subproject commit 406b18fdb3704a9e9e66cefbc74e7cff55f1947c diff --git a/qtdeclarative b/qtdeclarative index dfc6dc1d..0647df8c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dfc6dc1d94a729f701172861a196b4b34bcd7518 +Subproject commit 0647df8c88d4eaeedd19456b6e382308208e2be1 diff --git a/qtmultimedia b/qtmultimedia index d9dd7f48..636f46f0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd +Subproject commit 636f46f04ba6d5c63783558ed78eb5f562179e9c diff --git a/qtqa b/qtqa index cacf0675..5e3b8ac7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 +Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 diff --git a/qtwebengine b/qtwebengine index c3c37b4e..a2c365cb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c3c37b4e93a26748497bec1a0dc29b8358408157 +Subproject commit a2c365cb1f22431845380159c29048da76c2b2a9 -- cgit v1.2.1 From b88acae7a8e773c307e44f84da037d01d19e60f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 8 Aug 2019 10:04:18 +0000 Subject: Partially revert 'Do DeveloperBuild for Boot2Qt' This partially reverts commit 8f073cea69dde52b66577de4417fbc34db9e7476. Autotests slow down way too much still, so we can't run developers builds eveywhere. Task-number: QTBUG-63152 Task-number: QTBUG-77304 Task-number: COIN-326 Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.yaml | 4 ++-- coin/platform_configs/qtbase.yaml | 14 ++++++++++++++ coin/platform_configs/qtdeclarative.yaml | 12 ++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index d2aa8f10..640196ad 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -136,13 +136,13 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index dbe93909..af68635a 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -1,3 +1,17 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'arm64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-windows-10-x86_64-10' Target os: 'WinRT_10' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 7c4f6722..9327b92e 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -1,3 +1,15 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'arm64' + Compiler: 'GCC' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' -- cgit v1.2.1 From 42bfac5bf847cc7505d0bf5be2aff179ed2ed28e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Jul 2019 11:30:55 +0200 Subject: Include qtvirtualkeyboard again This partially reverts commit 452e0d94d40bba15a56293a0a0f7d093dececda9. Task-number: QTBUG-76371 Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8 Reviewed-by: Mitch Curtis --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9884474c..7657f30f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -264,7 +264,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.12 - status = ignore + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative -- cgit v1.2.1 From 0f89c023282e677ddd457b16eb9d49e3e1f62748 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 8 Aug 2019 15:34:24 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04 Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 6c19dd89..02b47ec4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6c19dd8989895b29a3f0b46871ed5f360e7b3440 +Subproject commit 02b47ec4a5f956b45436e078fbc7505c664d3bea diff --git a/qtremoteobjects b/qtremoteobjects index ff2c16f4..085935e7 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ff2c16f4acfb3b59a3b1b7aa0d4b1f361b026ba8 +Subproject commit 085935e7c2e7793ca915e64f2ed9d6ae37570e21 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6143eec2..d0cd3279 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6143eec2525af08e6aab895bcf64c2745a427f13 +Subproject commit d0cd32798fa9c36dc4294ed78596ed2b798d37f8 -- cgit v1.2.1 From f32c9f755edf4dd75ec8bd3066c11e37ab6e1e84 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 3 Aug 2019 12:47:03 +0200 Subject: Include QtWebEngine again This reverts commit a94696ccd5be936099809eda58db02999cb7c77a partially. Task-number: QTBUG-77304 Task-number: QTBUG-77305 Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28 Reviewed-by: Jani Heikkinen --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c59f64ff..1aa79a80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = 5.13.1 - status = ignore + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative -- cgit v1.2.1