From 2715a17c9bbe35738549fcb9fec92ad965fae072 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 8 Dec 2016 15:46:06 +0100 Subject: get rid of custom 'qt' gitmodules property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki Reviewed-by: Joerg Bornemann Reviewed-by: Aapo Keskimolo Reviewed-by: Eike Ziller Reviewed-by: Iikka Eklund Reviewed-by: Jake Petroules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index b4d74220..9e391985 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ url = ../qtrepotools.git branch = master status = essential - qt = false + project = - [submodule "qtwebkit"] depends = qtbase recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns -- cgit v1.2.3 From 8325f2bde99910c26077ab4321046f42489261bb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 27 Apr 2017 12:34:03 +0200 Subject: Adjust submodule branches Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951 --- .gitmodules | 82 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 8be71f45..4756d07d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.9.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.9.0 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.9.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.9 + branch = 5.9.0 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.9 + branch = 5.9.0 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,14 +226,14 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel @@ -241,86 +241,86 @@ serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.9.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech - branch = 5.9 + branch = 5.9.0 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth - branch = 5.9 + branch = 5.9.0 status = preview [submodule "qtremoteobjects"] depends = qtbase path = qtremoteobjects url = ../qtremoteobjects - branch = 5.9 + branch = 5.9.0 status = preview -- cgit v1.2.3 From 40b07da1941a66a748c293cbe91668debd63c59a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 24 Apr 2017 13:43:05 +0200 Subject: make sure that all submodule urls end in .git http(s) needs that. Started-by: Alvaro Denis Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988 Reviewed-by: Oswald Buddenhagen --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 8be71f45..6355ce8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -295,32 +295,32 @@ depends = qtbase recommends = qtdeclarative path = qtgamepad - url = ../qtgamepad + url = ../qtgamepad.git branch = 5.9 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml - url = ../qtscxml + url = ../qtscxml.git branch = 5.9 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech - url = ../qtspeech + url = ../qtspeech.git branch = 5.9 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth - url = ../qtnetworkauth + url = ../qtnetworkauth.git branch = 5.9 status = preview [submodule "qtremoteobjects"] depends = qtbase path = qtremoteobjects - url = ../qtremoteobjects + url = ../qtremoteobjects.git branch = 5.9 status = preview -- cgit v1.2.3 From 933688fc39b21fae8f201fed29ab46cf8ce5ded9 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 27 Apr 2017 12:54:54 +0900 Subject: Change qt3d dependency on qtimageformats to optional only examples use webp from qtimageformats. Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7 Reviewed-by: Sean Harmer Reviewed-by: Oswald Buddenhagen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 6355ce8b..a9d23be2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -146,8 +146,8 @@ branch = 5.9 status = addon [submodule "qt3d"] - depends = qtdeclarative qtimageformats - recommends = qtgamepad + depends = qtdeclarative + recommends = qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = 5.9 -- cgit v1.2.3 From 60fb73a1ebffda7a77c4e36a5c385a3fbb8a3615 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 2 Jun 2017 20:29:10 -0700 Subject: qtremoteobjects has QML plugins Change-Id: Ia3e896da908f42939148fffd14c47ef303f5d0e7 Reviewed-by: Simon Hausmann Reviewed-by: Brett Stottlemyer --- .gitmodules | 1 + 1 file changed, 1 insertion(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index d1a6c721..145fac4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -320,6 +320,7 @@ status = preview [submodule "qtremoteobjects"] depends = qtbase + recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git branch = 5.9 -- cgit v1.2.3