lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-18 02:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

renamed qtwebkit-examples-and-demos => qtwebkit-examples

Browse Source 
Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-04-30 11:23:38 +02:00
committed by The Qt Project
parent b25fcb31a7
commit 730e330068
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -37,9 +37,9 @@
[submodule "qtwebkit"] [submodule "qtwebkit"]
path = qtwebkit path = qtwebkit
url = git://gitorious.org/qt/qtwebkit.git url = git://gitorious.org/qt/qtwebkit.git
[submodule "qtwebkit-examples-and-demos"] [submodule "qtwebkit-examples"]
path = qtwebkit-examples-and-demos path = qtwebkit-examples
url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git url = git://gitorious.org/qt/qtwebkit-examples.git
[submodule "qtqa"] [submodule "qtqa"]
path = qtqa path = qtqa
url = git://gitorious.org/qt/qtqa.git url = git://gitorious.org/qt/qtqa.git

6
init-repository
View File

@@ -241,7 +241,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qttranslations qttranslations
qtwayland qtwayland
qtwebkit qtwebkit
qtwebkit-examples-and-demos qtwebkit-examples
qtx11extras qtx11extras
qtxmlpatterns qtxmlpatterns
); );
@@ -266,7 +266,7 @@ my @DEFAULT_REPOS = qw(
qttools qttools
qttranslations qttranslations
qtwebkit qtwebkit
qtwebkit-examples-and-demos qtwebkit-examples
qtx11extras qtx11extras
qtxmlpatterns qtxmlpatterns
); );
@@ -419,7 +419,7 @@ sub git_disable_webkit_submodule
my ($self) = @_; my ($self) = @_;
$self->exe('git', 'config', '--remove', 'submodule.qtwebkit'); $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; return;
} }

2
qt.pro
View File

@@ -73,7 +73,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative, qtjsondb) addModule(qtpim, qtdeclarative, qtjsondb)
addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples-and-demos, qtwebkit qttools) addModule(qtwebkit-examples, qtwebkit qttools)
addModule(qtimageformats, qtbase) addModule(qtimageformats, qtbase)
addModule(qtgraphicaleffects, qtdeclarative) addModule(qtgraphicaleffects, qtdeclarative)
addModule(qtscript, qtbase) addModule(qtscript, qtbase)

0
qtwebkit-examples-and-demos → qtwebkit-examples
View File