diff options
author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-08-21 14:31:55 +0300 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-09-03 17:40:10 +0000 |
commit | 4116ec2474e608c9a752ace5e8eb92cbd4052ebc (patch) | |
tree | 95dcca3b1c7640a99cc80693547d3378d4405877 | |
parent | 3e1fd2cb317bdd886ac8f4aa6d1e9b8e0018e99b (diff) |
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>
-rw-r--r-- | .gitmodules | 2 | ||||
-rwxr-xr-x | init-repository | 11 | ||||
-rw-r--r-- | qt.pro | 4 |
3 files changed, 2 insertions, 15 deletions
diff --git a/.gitmodules b/.gitmodules index edeb0842..57a2b261 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/init-repository b/init-repository index e80c7dca..91d27824 100755 --- a/init-repository +++ b/init-repository @@ -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; } @@ -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) |