renamed qtwebkit-examples-and-demos => qtwebkit-examples
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Tue, 30 Apr 2013 09:23:38 +0000 (11:23 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 1 May 2013 04:12:16 +0000 (06:12 +0200)
Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
.gitmodules
init-repository
qt.pro
qtwebkit-examples [moved from qtwebkit-examples-and-demos with 100% similarity]

index 584c4ce..5c2c6ad 100644 (file)
@@ -37,9 +37,9 @@
 [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
+[submodule "qtwebkit-examples"]
+       path = qtwebkit-examples
+       url = git://gitorious.org/qt/qtwebkit-examples.git
 [submodule "qtqa"]
        path = qtqa
        url = git://gitorious.org/qt/qtqa.git
index 5a2bd2c..3bd600f 100755 (executable)
@@ -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;
 }
diff --git a/qt.pro b/qt.pro
index 33a9469..218701a 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -73,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)