summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rwxr-xr-xinit-repository11
-rw-r--r--qt.pro4
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;
}
diff --git a/qt.pro b/qt.pro
index bf8a7bab..0147ad2b 100644
--- a/qt.pro
+++ b/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)