Updated submodules.

Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Updated submodules.
2026-01-30 18:35:59 +08:00 · 2013-10-22 05:27:19 +02:00 · 2013-10-16 18:38:03 +02:00 · 2013-10-15 21:01:19 +02:00 · 2013-10-12 23:23:49 +02:00 · 2013-10-08 15:45:02 +02:00
27 changed files with 30 additions and 29 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -6,15 +6,15 @@

 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
+# Change log entry (see below for instructions).
+#[ChangeLog][][]
+#
 # One task per entry. Remember space after colon.
 #Task-number: 
 #
 # Solicit reviewers. They still need to use the Gerrit frontend.
 #Reviewed-by: 
 #
-# Change log entry (see below for instructions).
-#[ChangeLog][][]
-#
 # ==[ Please wrap at 72 characters ]===================================|
 #
 # Remember to read http://wiki.qt-project.org/Commit_Policy
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Makefile
 .qmake.cache
+.qmake.super
--- a/qt.pro
+++ b/qt.pro
@@ -61,16 +61,16 @@ addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-addModule(qtwinextras, qtbase, qtdeclarative)
 addModule(qtquickcontrols, qtdeclarative)
 addModule(qtmultimedia, qtdeclarative)
+addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
 addModule(qt3d, qtdeclarative)
 addModule(qtjsondb, qtdeclarative)
 addModule(qtsystems, qtbase, qtdeclarative)
 addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtsystems)
+addModule(qtconnectivity, qtbase, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
--- 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
Qt Submodule Update Bot	c116096065	Updated submodules. Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>	2013-10-22 05:27:19 +02:00
Qt Submodule Update Bot	7e2e8cad66	Updated submodules. Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-10-16 18:38:03 +02:00
Qt Submodule Update Bot	cb2d850b47	Updated submodules. Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-10-15 21:01:19 +02:00
Qt Submodule Update Bot	f9a5d19416	Updated submodules. Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>	2013-10-12 23:23:49 +02:00
Mandeep Sandhu	728cd2e173	Ignore auto-generated file .qmake.super Added rule in .gitignore for .qmake.super. This file is generated when building Qt from the root dir. Task-number: QTBUG-33439 Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>	2013-10-08 15:45:02 +02:00
Oswald Buddenhagen	f09783bb80	move changelog entry before the real footers the change-id will be added at the end, which will look just plain stupid if the other "real" footers come above the changelog. also, a smart log author would integrate the changelog entry into the flow of the message, so further up in the template is more natural. Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>	2013-10-08 15:44:55 +02:00
Sergio Ahumada	bc6bcaa323	qt.pro: Fix dependencies for qtconnectivity Remove the hard dependency on qtsystems and changing it with a hard dependency on qtbase and a optional dependency on qtdeclarative instead. Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>	2013-10-08 15:44:50 +02:00
Qt Submodule Update Bot	7f523a7aa3	Updated submodules. Change-Id: Ie937791dcbe07d65728ab2cea1d590ab1eec8922 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-10-08 10:50:26 +02:00
J-P Nurmi	bf0bfeb991	Mark qtmultimedia as an optional dependency for qtwinextras The QtWinExtras Music Player example uses QtMultimedia. Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015 Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-10-08 10:48:23 +02:00
Qt Submodule Update Bot	e937791dcb	Updated submodules. Change-Id: I2f20faa052b66b7e85802368cd42447f09d8e321 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-10-07 09:03:53 +02:00