Updated submodules.

Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a
nuke qlalr submodule
2026-01-14 19:06:56 +08:00 · 2014-02-26 07:33:29 +02:00 · 2014-02-22 18:22:38 +01:00 · 2014-02-21 07:16:40 +01:00 · 2014-02-20 12:21:07 +01:00 · 2014-02-19 16:13:02 +01:00
32 changed files with 42 additions and 39 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -4,17 +4,14 @@
 # ==[ Details: Describe what changed and explain why it changed ]======|


-# ==[ Footers: Uncomment and edit where applicable ]===================|
-#
 # Change log entry (see below for instructions).
 #[ChangeLog][][]
+
+# ==[ Footers: Uncomment and edit where applicable ]===================|
 #
 # One task per entry. Remember space after colon.
 #Task-number: 
 #
-# Solicit reviewers. They still need to use the Gerrit frontend.
-#Reviewed-by: 
-#
 # ==[ Please wrap at 72 characters ]===================================|
 #
 # Remember to read http://wiki.qt-project.org/Commit_Policy
@@ -22,7 +19,8 @@
 # Change log entry: If this commit adds a significant feature, fixes an
 # issue or contains a behavior change that is relevant to others,
 # add a change log entry. It can be multiple lines long and ends with an
-# empty newline.
+# empty newline. Try to integrate it into the flow of the commit message
+# to avoid redundancy.
 # Use the module name to indicate the area of the change e.g. [QtCore].
 # Optionally specify a class or subtopic [QtNetwork][QSslSocket].
 # Other common tags are: [General], [Important Behavior Changes],
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,6 @@
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-[submodule "qlalr"]
-	path = qlalr
-	url = ../qlalr.git
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
@@ -103,3 +100,6 @@
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
+[submodule "qtwebsockets"]
+	path = qtwebsockets
+	url = ../qtwebsockets.git
--- a/3
+++ b/3
@@ -200,7 +200,6 @@ my %PROTOCOLS = (
 my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
    qt3d
    qt5
-    qlalr
    qtactiveqt
    qtandroidextras
    qtbase
@@ -231,6 +230,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
    qtwayland
    qtwebkit
    qtwebkit-examples
+    qtwebsockets
    qtwinextras
    qtx11extras
    qtxmlpatterns
@@ -258,6 +258,7 @@ my @DEFAULT_REPOS = qw(
    qtsvg
    qttools
    qttranslations
+    qtwebsockets
    qtwebkit
    qtwebkit-examples
    qtwinextras
--- a/1
+++ b/1
--- a/qt.pro
+++ b/qt.pro
@@ -3,6 +3,7 @@ cache(, super)

 CONFIG += build_pass   # hack to disable the .qmake.super auto-add
 load(qt_build_config)
+CONFIG -= build_pass   # unhack, as it confuses Qt Creator

 TEMPLATE      = subdirs

@@ -53,11 +54,13 @@ defineTest(addModule) {
 # users responsibility to ensure that all needed dependencies exist, or
 # it may not build.

+ANDROID_EXTRAS =
+android: ANDROID_EXTRAS = qtandroidextras
+
 addModule(qtbase)
 addModule(qtandroidextras, qtbase)
 addModule(qtmacextras, qtbase)
 addModule(qtx11extras, qtbase)
-addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
@@ -70,7 +73,7 @@ addModule(qtjsondb, qtdeclarative)
 addModule(qtsystems, qtbase, qtdeclarative)
 addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtbase, qtdeclarative)
+addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
@@ -84,6 +87,7 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb)
 !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
 addModule(qtserialport, qtbase)
 addModule(qtenginio, qtdeclarative)
+addModule(qtwebsockets, qtbase, qtdeclarative)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, 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/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	63200543dd	Updated submodules. Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a	2014-02-26 07:33:29 +02:00
Oswald Buddenhagen	4e92039103	nuke qlalr submodule it was merged back into qtbase. Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>	2014-02-22 18:22:38 +01:00
Qt Submodule Update Bot	0a23321599	Updated submodules. Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-21 07:16:40 +01:00
Oswald Buddenhagen	6b22ad702d	remove reviewed-by template unlike previously thought, gerrit does not remove recognized reviewers who did not actually make a review. so better not suggest adding potentially misleading footers. Change-Id: I92d2833ca8888a2c2c09dfacb0cff122cad1eb15	2014-02-20 12:21:07 +01:00
Oswald Buddenhagen	a3152cb8f1	Merge remote-tracking branch 'gerrit/dev' into stable Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c	2014-02-19 16:13:02 +01:00
Qt Submodule Update Bot	dc199e37d5	Updated submodules. Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-17 20:44:41 +01:00
Frederik Gladhorn	a7dc6fd595	Add qtwebsockets as submodule This just adds the module, it doesn't yet make it part of Qt 5.3 or anything like that Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>	2014-02-17 06:32:17 +01:00
Qt Submodule Update Bot	fe236cc44c	Updated submodules. Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-16 08:11:37 +01:00
Qt Submodule Update Bot	b2385231c4	Updated submodules. Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-15 17:13:03 +01:00
Qt Submodule Update Bot	7befa70253	Updated submodules. Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-15 17:12:38 +01:00
Qt Submodule Update Bot	805c735b02	Updated submodules. Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-13 10:31:05 +01:00
Qt Submodule Update Bot	ae9c68d190	Updated submodules. Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-10 14:03:43 +01:00
Friedemann Kleint	ef51fe0ebb	Merge "Merge branch 'stable' into dev" into refs/staging/dev	2014-02-06 08:46:01 +01:00
Qt Submodule Update Bot	3b525e1235	Updated submodules. Change-Id: If37564a74908846d69141b95c7edd938f4fc2379 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-02-05 12:46:41 +01:00
Frederik Gladhorn	76e16b228e	Merge branch 'stable' into dev Conflicts: qtactiveqt qtandroidextras qtbase qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwinextras qtx11extras qtxmlpatterns Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5	2014-01-29 13:52:49 +01:00
Oswald Buddenhagen	604f330cd2	don't unnecessarily confuse qt creator our CONFIG+=build_pass hack has the side effect that qmake does not emit the calling command line to the makefile, which makes creator unable to detect the build. so revert the hack as soon as it did its deed. Task-number: QTBUG-34788 Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>	2014-01-23 07:18:25 +01:00
Qt Submodule Update Bot	b25883ebaa	Updated submodules. Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>	2014-01-20 18:37:41 +01:00
Qt Submodule Update Bot	a968d5d531	Updated submodules. Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-01-20 12:43:47 +01:00
Qt Submodule Update Bot	5fd794ca6d	Updated submodules. Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-01-17 09:37:44 +01:00
Alex Blasche	4b256e249b	Add QtAndroidExtras to dependency list of QtConnectivity We only need it for Android builds though. Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>	2014-01-14 14:19:38 +01:00
Qt Submodule Update Bot	f37564a749	Updated submodules. Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>	2014-01-11 11:59:15 +01:00
Qt Submodule Update Bot	c8d3a71d7c	Updated submodules. Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd Reviewed-by: Matti Paaso <matti.paaso@digia.com>	2014-01-10 08:49:02 +01:00
Qt Submodule Update Bot	402457bcfb	Updated submodules. Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>	2014-01-09 18:00:53 +01:00
Qt Submodule Update Bot	baac9b5129	Updated submodules. Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>	2014-01-09 07:52:59 +01:00
Qt Submodule Update Bot	06d0fa240f	Updated submodules. Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2014-01-02 08:10:02 +01:00
Qt Submodule Update Bot	a250914fec	Updated submodules. Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2013-12-20 06:41:46 +01:00
Qt Submodule Update Bot	f7b7ff4f9f	Updated submodules. Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>	2013-12-16 12:41:55 +01:00
Qt Submodule Update Bot	ec0c8697aa	Updated submodules. Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>	2013-12-16 11:26:06 +01:00
Oswald Buddenhagen	dbac1e77f7	try to make the ChangeLog template more inviting move it even futher up and encourage integrating it into the rest of the commit message. Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829 Reviewed-by: Sergio Ahumada <sahumada@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>	2013-11-30 15:24:54 +01:00
Sergio Ahumada	4c925babf9	Merge "Merge branch 'stable' into dev" into refs/staging/dev	2013-10-16 12:39:27 +02:00
Qt Submodule Update Bot	d000023376	Updated submodules. Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-10-15 20:33:49 +02:00
Sergio Ahumada	38b7c75f6b	Merge branch 'stable' into dev Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8	2013-10-15 12:13:50 +02:00
Qt Submodule Update Bot	1aa3ccbc4c	Updated submodules. Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-10-14 17:52:01 +02:00