Compare commits

...

8 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
0c037851c5 Updated submodules.
Change-Id: I2f1f8f19f5ebae4029458dab0e0f5e06c47f61d8
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-16 03:30:16 +00:00
Qt Submodule Update Bot
2f1f8f19f5 Updated submodules.
Change-Id: Ied01b41435a7e127e8fa5b40e52867f5fb56fd49
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-15 09:21:57 +00:00
Qt Submodule Update Bot
ed01b41435 Updated submodules.
Change-Id: If3f0a810c035558bf33403e8d0b1dcad3208d3ed
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-09 04:11:12 +00:00
Qt Submodule Update Bot
f3f0a810c0 Updated submodules.
Change-Id: Icb7278ca5e7949580599630f7a9bc48883da3553
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-06 07:19:19 +00:00
Qt Submodule Update Bot
cb7278ca5e Updated submodules.
Change-Id: Ie0d4a160f33f35228e2b08ca93c872ef6e8fc891
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-04 03:29:00 +00:00
Simon Hausmann
2f30035850 Add qtgraphicaleffects as optional dependency to qtquickcontrols
Since the import of QtQuick.Extras, this is now a dependency

Change-Id: Iebd74ab80ea41ef7ff24d5e991003641ffba0b8c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2015-06-02 07:27:37 +00:00
Qt Submodule Update Bot
e0d4a160f3 Updated submodules.
Change-Id: I31ee12ede4defe80e20dd49b9ca7b425b6758965
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-02 07:11:12 +00:00
Oswald Buddenhagen
52a11c1c46 Adjust submodule branches
Change-Id: If5fe7b9f7dc6d751eaf7ca4ea8c830427d341dea
2015-05-22 12:47:10 +02:00
29 changed files with 59 additions and 59 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.0
initrepo = true initrepo = true
[submodule "qtsvg"] [submodule "qtsvg"]
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtscript"] [submodule "qtscript"]
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qttools"] [submodule "qttools"]
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
path = qtxmlpatterns path = qtxmlpatterns
url = ../qtxmlpatterns.git url = ../qtxmlpatterns.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qttranslations"] [submodule "qttranslations"]
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtdoc"] [submodule "qtdoc"]
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 5.5 branch = 5.5.0
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.0
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.0
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.0
initrepo = true initrepo = true
[submodule "qtsensors"] [submodule "qtsensors"]
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 5.5 branch = 5.5.0
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.0
initrepo = true initrepo = true
[submodule "qtwayland"] [submodule "qtwayland"]
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qt3d"] [submodule "qt3d"]
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtimageformats"] [submodule "qtimageformats"]
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtquick1"] [submodule "qtquick1"]
path = qtquick1 path = qtquick1
url = ../qtquick1.git url = ../qtquick1.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtgraphicaleffects"] [submodule "qtgraphicaleffects"]
path = qtgraphicaleffects path = qtgraphicaleffects
url = ../qtgraphicaleffects.git url = ../qtgraphicaleffects.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtquickcontrols"] [submodule "qtquickcontrols"]
path = qtquickcontrols path = qtquickcontrols
url = ../qtquickcontrols.git url = ../qtquickcontrols.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtserialport"] [submodule "qtserialport"]
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtx11extras"] [submodule "qtx11extras"]
path = qtx11extras path = qtx11extras
url = ../qtx11extras.git url = ../qtx11extras.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtmacextras"] [submodule "qtmacextras"]
path = qtmacextras path = qtmacextras
url = ../qtmacextras.git url = ../qtmacextras.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtwinextras"] [submodule "qtwinextras"]
path = qtwinextras path = qtwinextras
url = ../qtwinextras.git url = ../qtwinextras.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtandroidextras"] [submodule "qtandroidextras"]
path = qtandroidextras path = qtandroidextras
url = ../qtandroidextras.git url = ../qtandroidextras.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtenginio"] [submodule "qtenginio"]
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
branch = 1.2 branch = 1.2.0
initrepo = true initrepo = true
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtwebengine"] [submodule "qtwebengine"]
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
path = qtcanvas3d path = qtcanvas3d
url = ../qtcanvas3d.git url = ../qtcanvas3d.git
branch = 5.5 branch = 5.5.0
initrepo = true initrepo = true

2
qt.pro
View File

@@ -64,7 +64,7 @@ addModule(qtx11extras, qtbase)
addModule(qtsvg, qtbase) addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase) addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns) addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
addModule(qtquickcontrols, qtdeclarative) addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects)
addModule(qtmultimedia, qtbase, qtdeclarative) addModule(qtmultimedia, qtbase, qtdeclarative)
addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
addModule(qtactiveqt, qtbase) addModule(qtactiveqt, qtbase)

2
qt3d

Submodule qt3d updated: c09b9c5483...60cb61f9d7

2
qtbase

Submodule qtbase updated: 009b11c300...61ca116a2e

2
qtdoc

Submodule qtdoc updated: b2372d229c...58e39f635a

2
qtqa

Submodule qtqa updated: 3fdc5e3166...31235fa2d0

Submodule qttools updated: ab5d64354d...e1b97bb31a