Compare commits

...

8 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
57d4fc9ceb Updated submodules.
Change-Id: I2579c442085495cd179d00e09285797bbb08b3eb
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-10-12 06:20:26 +00:00
Qt Submodule Update Bot
2579c44208 Updated submodules.
Change-Id: Ic1fbc6dfde579eaba980664444feaf9083dd4d39
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-10-06 18:56:13 +00:00
Qt Submodule Update Bot
c1fbc6dfde Updated submodules.
Change-Id: I063e5f899e0d33d5afe15dfb00221bd5d93aab3b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-29 19:15:45 +00:00
Qt Submodule Update Bot
063e5f899e Updated submodules.
Change-Id: If835537d9fe8076aaf7a8b6311dbdf30b01d1900
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-27 11:17:00 +00:00
Qt Submodule Update Bot
f835537d9f Updated submodules.
Change-Id: Ie4b9dc169153021a9204b6fdf3af9f58228fdf3e
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-24 04:32:16 +00:00
Qt Submodule Update Bot
e4b9dc1691 Updated submodules.
Change-Id: Iad31b8c5743bd4d9ff00b06466530193dd26853f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-17 10:53:17 +00:00
Qt Submodule Update Bot
ad31b8c574 Updated submodules.
Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-10 11:46:31 +00:00
Frederik Gladhorn
b68c8b9729 Adjust submodule branches
Change-Id: I6e3c7677499747fc10ff1a4e3eaa6e66a409c03e
2015-09-03 16:59:46 +02:00
24 changed files with 54 additions and 54 deletions

62
.gitmodules vendored
View File

@@ -1,52 +1,52 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtsvg"] [submodule "qtsvg"]
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtscript"] [submodule "qtscript"]
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qttools"] [submodule "qttools"]
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
path = qtxmlpatterns path = qtxmlpatterns
url = ../qtxmlpatterns.git url = ../qtxmlpatterns.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qttranslations"] [submodule "qttranslations"]
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtdoc"] [submodule "qtdoc"]
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtrepotools"] [submodule "qtrepotools"]
path = qtrepotools path = qtrepotools
@@ -56,12 +56,12 @@
[submodule "qtwebkit"] [submodule "qtwebkit"]
path = qtwebkit path = qtwebkit
url = ../qtwebkit.git url = ../qtwebkit.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtwebkit-examples"] [submodule "qtwebkit-examples"]
path = qtwebkit-examples path = qtwebkit-examples
url = ../qtwebkit-examples.git url = ../qtwebkit-examples.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtqa"] [submodule "qtqa"]
path = qtqa path = qtqa
@@ -71,12 +71,12 @@
[submodule "qtlocation"] [submodule "qtlocation"]
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtsensors"] [submodule "qtsensors"]
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtsystems"] [submodule "qtsystems"]
path = qtsystems path = qtsystems
@@ -97,85 +97,85 @@
[submodule "qtconnectivity"] [submodule "qtconnectivity"]
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtwayland"] [submodule "qtwayland"]
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qt3d"] [submodule "qt3d"]
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtimageformats"] [submodule "qtimageformats"]
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtquick1"] [submodule "qtquick1"]
path = qtquick1 path = qtquick1
url = ../qtquick1.git url = ../qtquick1.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtgraphicaleffects"] [submodule "qtgraphicaleffects"]
path = qtgraphicaleffects path = qtgraphicaleffects
url = ../qtgraphicaleffects.git url = ../qtgraphicaleffects.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtquickcontrols"] [submodule "qtquickcontrols"]
path = qtquickcontrols path = qtquickcontrols
url = ../qtquickcontrols.git url = ../qtquickcontrols.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtserialport"] [submodule "qtserialport"]
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtx11extras"] [submodule "qtx11extras"]
path = qtx11extras path = qtx11extras
url = ../qtx11extras.git url = ../qtx11extras.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtmacextras"] [submodule "qtmacextras"]
path = qtmacextras path = qtmacextras
url = ../qtmacextras.git url = ../qtmacextras.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtwinextras"] [submodule "qtwinextras"]
path = qtwinextras path = qtwinextras
url = ../qtwinextras.git url = ../qtwinextras.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtandroidextras"] [submodule "qtandroidextras"]
path = qtandroidextras path = qtandroidextras
url = ../qtandroidextras.git url = ../qtandroidextras.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtenginio"] [submodule "qtenginio"]
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
branch = 1.2 branch = 1.2.1
initrepo = true initrepo = true
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtwebengine"] [submodule "qtwebengine"]
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
path = qtcanvas3d path = qtcanvas3d
url = ../qtcanvas3d.git url = ../qtcanvas3d.git
branch = 5.5 branch = 5.5.1
initrepo = true initrepo = true

2
qtbase

Submodule qtbase updated: 7010da2e62...6542161d5c

2
qtdoc

Submodule qtdoc updated: ee02a2d816...03117638dd

2
qtqa

Submodule qtqa updated: 0e8bad86ad...dca1914237

Submodule qttools updated: 1d7b5b2e1c...0240288756