Skip to content
Snippets Groups Projects
Commit 4116ec24 authored by Jani Heikkinen's avatar Jani Heikkinen Committed by Simon Hausmann
Browse files

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: default avatarTuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: default avatarLars Knoll <lars.knoll@theqtcompany.com>
parent 3e1fd2cb
No related merge requests found
...@@ -57,12 +57,10 @@ ...@@ -57,12 +57,10 @@
path = qtwebkit path = qtwebkit
url = ../qtwebkit.git url = ../qtwebkit.git
branch = 5.6 branch = 5.6
initrepo = true
[submodule "qtwebkit-examples"] [submodule "qtwebkit-examples"]
path = qtwebkit-examples path = qtwebkit-examples
url = ../qtwebkit-examples.git url = ../qtwebkit-examples.git
branch = 5.6 branch = 5.6
initrepo = true
[submodule "qtqa"] [submodule "qtqa"]
path = qtqa path = qtqa
url = ../qtqa.git url = ../qtqa.git
......
...@@ -79,12 +79,6 @@ B<Module options:> ...@@ -79,12 +79,6 @@ B<Module options:>
=over =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>... =item --module-subset=<module1>,<module2>...
Only initialize the specified subset of modules given as the argument. Specified Only initialize the specified subset of modules given as the argument. Specified
...@@ -239,7 +233,6 @@ sub parse_arguments ...@@ -239,7 +233,6 @@ sub parse_arguments
'ignore-submodules' => 0 , 'ignore-submodules' => 0 ,
'mirror-url' => "", 'mirror-url' => "",
'update' => 1 , 'update' => 1 ,
'webkit' => 1 ,
'module-subset' => "default", 'module-subset' => "default",
); );
...@@ -254,7 +247,6 @@ sub parse_arguments ...@@ -254,7 +247,6 @@ sub parse_arguments
'mirror=s' => \$self->{qw{ mirror-url }}, 'mirror=s' => \$self->{qw{ mirror-url }},
'quiet' => \$self->{qw{ quiet }}, 'quiet' => \$self->{qw{ quiet }},
'update!' => \$self->{qw{ update }}, 'update!' => \$self->{qw{ update }},
'webkit!' => \$self->{qw{ webkit }},
'module-subset=s' => \$self->{qw{ module-subset }}, 'module-subset=s' => \$self->{qw{ module-subset }},
'help|?' => sub { pod2usage(1); }, 'help|?' => sub { pod2usage(1); },
...@@ -271,9 +263,6 @@ sub parse_arguments ...@@ -271,9 +263,6 @@ sub parse_arguments
$self->{'mirror-url'} =~ s{//+$}{/}; $self->{'mirror-url'} =~ s{//+$}{/};
$self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
if (!$self->{webkit}) {
push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples";
}
return; return;
} }
......
...@@ -84,12 +84,12 @@ addModule(qt3d, qtdeclarative qtimageformats) ...@@ -84,12 +84,12 @@ addModule(qt3d, qtdeclarative qtimageformats)
addModule(qtcanvas3d, qtdeclarative) addModule(qtcanvas3d, qtdeclarative)
addModule(qtgraphicaleffects, qtdeclarative) addModule(qtgraphicaleffects, qtdeclarative)
addModule(qtscript, qtbase, qttools) addModule(qtscript, qtbase, qttools)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns)
addModule(qtdocgallery, qtdeclarative) addModule(qtdocgallery, qtdeclarative)
addModule(qtwayland, qtbase, qtdeclarative) addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase) addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative) addModule(qtenginio, qtdeclarative)
addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation)
addModule(qttranslations, qttools) addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative) addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase) addModule(qtqa, qtbase)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment