diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rwxr-xr-x | init-repository | 6 | ||||
| -rw-r--r-- | qt.pro | 2 | ||||
| m--------- | qtwebkit-examples (renamed from qtwebkit-examples-and-demos) | 0 |
4 files changed, 7 insertions, 7 deletions
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; } @@ -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-and-demos b/qtwebkit-examples -Subproject 82985425670256a3ab194771184e50c63be8262 +Subproject 82985425670256a3ab194771184e50c63be8262 |