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>

.gitmodules

@@ -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

init-repository

@@ -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;
 }

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)