From 730e330068b4d2bc6098a8a4dbbd7fb98aef5452 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 30 Apr 2013 11:23:38 +0200
Subject: renamed qtwebkit-examples-and-demos => qtwebkit-examples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
---
 .gitmodules                 | 6 +++---
 init-repository             | 6 +++---
 qt.pro                      | 2 +-
 qtwebkit-examples           | 1 +
 qtwebkit-examples-and-demos | 1 -
 5 files changed, 8 insertions(+), 8 deletions(-)
 create mode 160000 qtwebkit-examples
 delete mode 160000 qtwebkit-examples-and-demos

diff --git a/.gitmodules b/.gitmodules
index 584c4cec..5c2c6ad9 100644
--- a/.gitmodules
+++ b/.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
diff --git a/init-repository b/init-repository
index 5a2bd2ce..3bd600ff 100755
--- a/init-repository
+++ b/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;
 }
diff --git a/qt.pro b/qt.pro
index 33a9469e..218701ab 100644
--- 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)
diff --git a/qtwebkit-examples b/qtwebkit-examples
new file mode 160000
index 00000000..82985425
--- /dev/null
+++ b/qtwebkit-examples
@@ -0,0 +1 @@
+Subproject commit 82985425670256a3ab194771184e50c63be82625
diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos
deleted file mode 160000
index 82985425..00000000
--- a/qtwebkit-examples-and-demos
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 82985425670256a3ab194771184e50c63be82625
-- 
cgit v1.2.3