mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 07:28:21 +08:00
Removed QtWebkit and QtWebkit-Examples from qt5.git
QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now be removed from qt5.git in Qt5.6 release Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
committed by
Simon Hausmann
parent
3e1fd2cb31
commit
4116ec2474
2
.gitmodules
vendored
2
.gitmodules
vendored
@@ -57,12 +57,10 @@
|
||||
path = qtwebkit
|
||||
url = ../qtwebkit.git
|
||||
branch = 5.6
|
||||
initrepo = true
|
||||
[submodule "qtwebkit-examples"]
|
||||
path = qtwebkit-examples
|
||||
url = ../qtwebkit-examples.git
|
||||
branch = 5.6
|
||||
initrepo = true
|
||||
[submodule "qtqa"]
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
|
||||
@@ -79,12 +79,6 @@ B<Module options:>
|
||||
|
||||
=over
|
||||
|
||||
=item --no-webkit
|
||||
|
||||
Skip webkit and webkit examples submodules.
|
||||
It may be desirable to skip these modules due to the large size of the webkit
|
||||
git repository.
|
||||
|
||||
=item --module-subset=<module1>,<module2>...
|
||||
|
||||
Only initialize the specified subset of modules given as the argument. Specified
|
||||
@@ -239,7 +233,6 @@ sub parse_arguments
|
||||
'ignore-submodules' => 0 ,
|
||||
'mirror-url' => "",
|
||||
'update' => 1 ,
|
||||
'webkit' => 1 ,
|
||||
'module-subset' => "default",
|
||||
);
|
||||
|
||||
@@ -254,7 +247,6 @@ sub parse_arguments
|
||||
'mirror=s' => \$self->{qw{ mirror-url }},
|
||||
'quiet' => \$self->{qw{ quiet }},
|
||||
'update!' => \$self->{qw{ update }},
|
||||
'webkit!' => \$self->{qw{ webkit }},
|
||||
'module-subset=s' => \$self->{qw{ module-subset }},
|
||||
|
||||
'help|?' => sub { pod2usage(1); },
|
||||
@@ -271,9 +263,6 @@ sub parse_arguments
|
||||
$self->{'mirror-url'} =~ s{//+$}{/};
|
||||
|
||||
$self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
|
||||
if (!$self->{webkit}) {
|
||||
push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples";
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
4
qt.pro
4
qt.pro
@@ -84,12 +84,12 @@ addModule(qt3d, qtdeclarative qtimageformats)
|
||||
addModule(qtcanvas3d, qtdeclarative)
|
||||
addModule(qtgraphicaleffects, qtdeclarative)
|
||||
addModule(qtscript, qtbase, qttools)
|
||||
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
|
||||
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns)
|
||||
addModule(qtdocgallery, qtdeclarative)
|
||||
addModule(qtwayland, qtbase, qtdeclarative)
|
||||
addModule(qtserialport, qtbase)
|
||||
addModule(qtenginio, qtdeclarative)
|
||||
addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation)
|
||||
addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation)
|
||||
addModule(qttranslations, qttools)
|
||||
addModule(qtdoc, qtdeclarative)
|
||||
addModule(qtqa, qtbase)
|
||||
|
||||
Reference in New Issue
Block a user