Updated qtbase with last minute ChangeLog additions.

Change-Id: I9bb290ca366bb397d77b5ed73d1ccf4bdeef456c
Updated submodules.
2025-12-21 23:48:23 +08:00 · 2015-06-26 08:31:33 +02:00 · 2015-06-25 09:25:47 +00:00 · 2015-06-23 04:45:29 +00:00 · 2015-06-22 10:39:13 +00:00 · 2015-06-16 03:30:16 +00:00
30 changed files with 60 additions and 60 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,12 +56,12 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
@@ -71,12 +71,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -97,85 +97,85 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 1.2
+	branch = 1.2.0
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
 [submodule "qtcanvas3d"]
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.5
+	branch = 5.5.0
 	initrepo = true
--- a/qt.pro
+++ b/qt.pro
@@ -64,7 +64,7 @@ addModule(qtx11extras, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-addModule(qtquickcontrols, qtdeclarative)
+addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects)
 addModule(qtmultimedia, qtbase, qtdeclarative)
 addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Oswald Buddenhagen	afc1ddcee6	Updated qtbase with last minute ChangeLog additions. Change-Id: I9bb290ca366bb397d77b5ed73d1ccf4bdeef456c	2015-06-26 08:31:33 +02:00
Qt Submodule Update Bot	4e9b207ce0	Updated submodules. Change-Id: I17167851b3eda381cd87a0e56068de011f74bd0f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-06-25 09:25:47 +00:00
Qt Submodule Update Bot	17167851b3	Updated submodules. Change-Id: I5175f09b688eab63470f23e2d90e23144384ee6e Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-06-23 04:45:29 +00:00
Qt Submodule Update Bot	5175f09b68	Updated submodules. Change-Id: I0c037851c548a61b35592b05a8d22616eb36119c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-06-22 10:39:13 +00:00
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