Compare commits

...

6 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
adf7bcc0b1 Updated submodules.
Change-Id: Iad4d8ba6850bd7e47c9841268e3e09408a4c9c18
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-01 17:50:10 +00:00
Qt Submodule Update Bot
d216c70d07 Updated submodules.
Change-Id: I84d69ad4ee32f4a232d848f7e9c00bef57c07a3c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-05-28 02:25:45 +00:00
Qt Submodule Update Bot
a5a1899f04 Updated submodules.
Change-Id: I674d7f94c1ae796eb82d7ba1a1cda42d7a2c3c0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-05-27 06:46:02 +00:00
Qt Submodule Update Bot
75cf7131d6 Updated submodules.
Change-Id: I6c449bb5e347f932049af12686a5e43a77065de0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-05-26 23:09:18 +00:00
Qt Submodule Update Bot
683bb7e19e Updated submodules.
Change-Id: Ie45483d44c61e3938b8fb3935c0f7542383d09b2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-05-18 12:10:25 +00:00
Oswald Buddenhagen
f404267506 Adjust submodule branches
Change-Id: I33f74b67b3729011fe38aae7654fe962d6701774
2016-05-06 12:42:48 +02:00
32 changed files with 65 additions and 65 deletions

68
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.6
branch = 5.6.1
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.6
branch = 5.6.1
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.6
branch = 5.6.1
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.6
branch = 5.6.1
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
branch = 5.6
branch = 5.6.1
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.6
branch = 5.6.1
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
branch = 5.6
branch = 5.6.1
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -74,7 +74,7 @@
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
path = qtwebkit
url = ../qtwebkit.git
branch = 5.6
branch = 5.6.1
status = obsolete
project = WebKit.pro
priority = 20
@@ -82,7 +82,7 @@
depends = qtwebkit qttools
path = qtwebkit-examples
url = ../qtwebkit-examples.git
branch = 5.6
branch = 5.6.1
status = obsolete
[submodule "qtqa"]
depends = qtbase
@@ -96,14 +96,14 @@
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
path = qtlocation
url = ../qtlocation.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -136,130 +136,130 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
path = qt3d
url = ../qt3d.git
branch = 5.6
branch = 5.6.1
status = preview
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = 5.6
branch = 5.6.1
status = obsolete
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.6
branch = 5.6.1
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.6
branch = 5.6.1
status = preview
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
path = qtenginio
url = ../qtenginio.git
branch = 5.6
branch = 5.6.1
status = deprecated
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
branch = 5.6
branch = 5.6.1
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.6
branch = 5.6.1
status = addon
[submodule "qtquickcontrols2"]
depends = qtquickcontrols
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.6
branch = 5.6.1
status = preview
[submodule "qtpurchasing"]
depends = qtbase

2
qt3d

Submodule qt3d updated: 36b6183bdf...2270fae50f

2
qtbase

Submodule qtbase updated: f57d8f1341...540978288e

2
qtdoc

Submodule qtdoc updated: f25c60fa21...f63dd18eab

2
qtqa

Submodule qtqa updated: db34e6f898...32893be6fa

2
qtsvg

Submodule qtsvg updated: cf25ebcf48...0e69a7c86f

Submodule qttools updated: e126ccfa0c...2d838dd06e