Updated qtquickcontrols submodule.

Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Updated submodules.
2026-03-12 07:16:08 +08:00 · 2013-05-11 19:02:05 +02:00 · 2013-05-09 12:22:54 +02:00 · 2013-05-01 06:12:31 +02:00 · 2013-05-01 06:12:16 +02:00 · 2013-04-29 23:17:16 +02:00
26 changed files with 66 additions and 62 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,96 +1,96 @@
 [submodule "qtbase"]
 	path = qtbase
-	url = git://gitorious.org/qt/qtbase.git
+	url = ../qtbase.git
 [submodule "qtsvg"]
 	path = qtsvg
-	url = git://gitorious.org/qt/qtsvg.git
+	url = ../qtsvg.git
 [submodule "qtdeclarative"]
 	path = qtdeclarative
-	url = git://gitorious.org/qt/qtdeclarative.git
+	url = ../qtdeclarative.git
 [submodule "qtactiveqt"]
 	path = qtactiveqt
-	url = git://gitorious.org/qt/qtactiveqt.git
+	url = ../qtactiveqt.git
 [submodule "qtscript"]
 	path = qtscript
-	url = git://gitorious.org/qt/qtscript.git
+	url = ../qtscript.git
 [submodule "qtmultimedia"]
 	path = qtmultimedia
-	url = git://gitorious.org/qt/qtmultimedia.git
+	url = ../qtmultimedia.git
 [submodule "qttools"]
 	path = qttools
-	url = git://gitorious.org/qt/qttools.git
+	url = ../qttools.git
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
-	url = git://gitorious.org/qt/qtxmlpatterns.git
+	url = ../qtxmlpatterns.git
 [submodule "qttranslations"]
 	path = qttranslations
-	url = git://gitorious.org/qt/qttranslations.git
+	url = ../qttranslations.git
 [submodule "qtdoc"]
 	path = qtdoc
-	url = git://gitorious.org/qt/qtdoc.git
+	url = ../qtdoc.git
 [submodule "qlalr"]
 	path = qlalr
-	url = git://gitorious.org/qt/qlalr.git
+	url = ../qlalr.git
 [submodule "qtrepotools"]
 	path = qtrepotools
-	url = git://gitorious.org/qt/qtrepotools.git
+	url = ../qtrepotools.git
 [submodule "qtwebkit"]
 	path = qtwebkit
-	url = git://gitorious.org/qt/qtwebkit.git
-[submodule "qtwebkit-examples-and-demos"]
-	path = qtwebkit-examples-and-demos
-	url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git
+	url = ../qtwebkit.git
+[submodule "qtwebkit-examples"]
+	path = qtwebkit-examples
+	url = ../qtwebkit-examples.git
 [submodule "qtqa"]
 	path = qtqa
-	url = git://gitorious.org/qt/qtqa.git
+	url = ../qtqa.git
 [submodule "qtlocation"]
 	path = qtlocation
-	url = git://gitorious.org/qt/qtlocation.git
+	url = ../qtlocation.git
 [submodule "qtsensors"]
 	path = qtsensors
-	url = git://gitorious.org/qt/qtsensors.git
+	url = ../qtsensors.git
 [submodule "qtsystems"]
 	path = qtsystems
-	url = git://gitorious.org/qt/qtsystems.git
+	url = ../qtsystems.git
 [submodule "qtfeedback"]
 	path = qtfeedback
-	url = git://gitorious.org/qt/qtfeedback.git
+	url = ../qtfeedback.git
 [submodule "qtdocgallery"]
 	path = qtdocgallery
-	url = git://gitorious.org/qt/qtdocgallery.git
+	url = ../qtdocgallery.git
 [submodule "qtpim"]
 	path = qtpim
-	url = git://gitorious.org/qt/qtpim.git
+	url = ../qtpim.git
 [submodule "qtconnectivity"]
 	path = qtconnectivity
-	url = git://gitorious.org/qt/qtconnectivity.git
+	url = ../qtconnectivity.git
 [submodule "qtwayland"]
 	path = qtwayland
-	url = git://gitorious.org/qt/qtwayland.git
+	url = ../qtwayland.git
 [submodule "qtjsondb"]
 	path = qtjsondb
-	url = git://gitorious.org/qt/qtjsondb.git
+	url = ../qtjsondb.git
 [submodule "qt3d"]
 	path = qt3d
-	url = git://gitorious.org/qt/qt3d.git
+	url = ../qt3d.git
 [submodule "qtjsbackend"]
 	path = qtjsbackend
-	url = git://gitorious.org/qt/qtjsbackend.git
+	url = ../qtjsbackend.git
 [submodule "qtimageformats"]
 	path = qtimageformats
-	url = git://gitorious.org/qt/qtimageformats.git
+	url = ../qtimageformats.git
 [submodule "qtquick1"]
 	path = qtquick1
-	url = git://gitorious.org/qt/qtquick1.git
+	url = ../qtquick1.git
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
-	url = git://gitorious.org/qt/qtgraphicaleffects.git
+	url = ../qtgraphicaleffects.git
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
-	url = git://gitorious.org/qt/qtquickcontrols.git
+	url = ../qtquickcontrols.git
 [submodule "qtserialport"]
 	path = qtserialport
-	url = git://gitorious.org/qt/qtserialport.git
+	url = ../qtserialport.git
 [submodule "qtx11extras"]
 	path = qtx11extras
-	url = git://gitorious.org/qt/qtx11extras.git
+	url = ../qtx11extras.git
--- a/6
+++ b/6
@@ -241,7 +241,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
    qttranslations
    qtwayland
    qtwebkit
-    qtwebkit-examples-and-demos
+    qtwebkit-examples
    qtx11extras
    qtxmlpatterns
 );
@@ -266,7 +266,7 @@ my @DEFAULT_REPOS = qw(
    qttools
    qttranslations
    qtwebkit
-    qtwebkit-examples-and-demos
+    qtwebkit-examples
    qtx11extras
    qtxmlpatterns
 );
@@ -419,7 +419,7 @@ sub git_disable_webkit_submodule
    my ($self) = @_;

    $self->exe('git', 'config', '--remove', 'submodule.qtwebkit');
-    $self->exe('git', 'config', '--remove', 'submodule.qtwebkit-examples-and-demos');
+    $self->exe('git', 'config', '--remove', 'submodule.qtwebkit-examples');

    return;
 }
--- a/qt.pro
+++ b/qt.pro
@@ -27,8 +27,12 @@ defineTest(addModule) {
        export($${mod}.makefile)
    }

-    for(d, 2): \
-        $${mod}.depends += $$moduleName($$d)
+    for(d, 2) {
+        dn = $$moduleName($$d)
+        !contains(SUBDIRS, $$dn): \
+            return(false)
+        $${mod}.depends += $$dn
+    }
    for(d, 3) {
        dn = $$moduleName($$d)
        contains(SUBDIRS, $$dn): \
@@ -69,7 +73,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
-addModule(qtwebkit-examples-and-demos, qtwebkit qttools)
+addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)
 addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtscript, 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/1
+++ b/1
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Sergio Ahumada	45b8f5c7fc	Updated qtquickcontrols submodule. Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>	2013-05-11 19:02:05 +02:00
Qt Submodule Update Bot	e78aad71e6	Updated submodules. Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-05-09 12:22:54 +02:00
Oswald Buddenhagen	33072afc58	use relative submodule specs this saves various trouble. this syntax is supported since git 1.7.0. Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>	2013-05-01 06:12:31 +02:00
Oswald Buddenhagen	730e330068	renamed qtwebkit-examples-and-demos => qtwebkit-examples Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>	2013-05-01 06:12:16 +02:00
Qt Submodule Update Bot	b25fcb31a7	Updated submodules. Change-Id: I18aaac18064518a3bf03ac624ff0295817fc9418 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-04-29 23:17:16 +02:00
Qt Submodule Update Bot	18aaac1806	Updated submodules. Change-Id: I09c3d8537e5dc8a7457cd7d7a0b284a0acf51069 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-04-21 18:45:04 +02:00
Qt Submodule Update Bot	09c3d8537e	Updated submodules. Change-Id: Icfbfb612338958b30f0abe2d00c919de693f10c9 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-04-20 02:49:49 +02:00
Oswald Buddenhagen	7b034fec34	skip modules whose mandatory dependencies are missing so that for example "-skip webkit" will also skip qtwebkit-examples. Task-number: QTBUG-30307 Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>	2013-04-18 19:09:07 +02:00
Qt Submodule Update Bot	cfbfb61233	Updated submodules. Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-04-18 12:43:32 +02:00
Qt Submodule Update Bot	6d08e322c7	Updated submodules. Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-04-17 18:38:52 +02:00
Qt Submodule Update Bot	fced9b8199	Updated submodules. Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-04-17 13:18:36 +02:00
Qt Submodule Update Bot	3e26038d5c	Updated submodules. Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>	2013-04-05 18:38:42 +02:00