From 5a0dc401fad4adccbd975392295d2c77d936900f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 8 Aug 2017 13:49:40 +0200 Subject: Remove QtWebKit and QtWebKit examples from Qt 5 They are subject to a separate release. Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262 Reviewed-by: Konstantin Tokarev --- .gitmodules | 18 +----------------- qtwebkit | 1 - qtwebkit-examples | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 160000 qtwebkit delete mode 160000 qtwebkit-examples diff --git a/.gitmodules b/.gitmodules index 9ea5c3b2..b4988927 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,7 +38,7 @@ status = essential [submodule "qttools"] depends = qtbase - recommends = qtdeclarative qtactiveqt qtwebkit + recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git branch = 5.9 @@ -69,21 +69,6 @@ branch = master status = essential project = - -[submodule "qtwebkit"] - depends = qtbase - recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns - path = qtwebkit - url = ../qtwebkit.git - branch = 5.9 - status = obsolete - project = WebKit.pro - priority = 20 -[submodule "qtwebkit-examples"] - depends = qtwebkit qttools - path = qtwebkit-examples - url = ../qtwebkit-examples.git - branch = 5.9 - status = obsolete [submodule "qtqa"] depends = qtbase path = qtqa @@ -238,7 +223,6 @@ [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools - serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git branch = 5.9 diff --git a/qtwebkit b/qtwebkit deleted file mode 160000 index 97c4a80a..00000000 --- a/qtwebkit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 97c4a80a1282c8c3eaa343011286b76fd4838c5f diff --git a/qtwebkit-examples b/qtwebkit-examples deleted file mode 160000 index a24c780b..00000000 --- a/qtwebkit-examples +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a24c780b60d7d8bc00c4a48042cf7f32db777d55 -- cgit v1.2.3