Remove unused WebKit2QML library

This library was introduced after Qt 5.1 as a transition to only using
WebKit2's C API. The transition was never completed and the WebKit2QML
library currently only contains one file and serves no purpose.

Change-Id: Iaa2cc0db5504c957065952b693fc68c8fcb84176
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

6 files changed, 5 insertions, 101 deletions

diff --git a/Source/WebKit2/Target.pri b/Source/WebKit2/Target.pri
index 597e01088..c4f57b0e0 100644
--- a/Source/WebKit2/Target.pri
+++ b/Source/WebKit2/Target.pri
@@ -793,6 +793,8 @@ have?(QTQUICK) {
         UIProcess/API/qt/qwebnavigationrequest_p.h \
         UIProcess/API/qt/qquickwebpage_p.h \
         UIProcess/API/qt/qquickwebpage_p_p.h \
+        UIProcess/API/qt/qwebnavigationhistory_p.h \
+        UIProcess/API/qt/qwebnavigationhistory_p_p.h \
         UIProcess/API/qt/qquickwebview_p.h \
         UIProcess/API/qt/qquickwebview_p_p.h \
         UIProcess/API/qt/qquicknetworkreply_p.h \
@@ -825,6 +827,7 @@ have?(QTQUICK) {
         UIProcess/API/qt/qwebloadrequest.cpp \
         UIProcess/API/qt/qwebnavigationrequest.cpp \
         UIProcess/API/qt/qquickwebpage.cpp \
+        UIProcess/API/qt/qwebnavigationhistory.cpp \
         UIProcess/API/qt/qquickwebview.cpp \
         UIProcess/API/qt/qwebiconimageprovider.cpp \
         UIProcess/API/qt/qquicknetworkreply.cpp \
diff --git a/Source/WebKit2/WebKit2.pro b/Source/WebKit2/WebKit2.pro
index 3426ff08f..66129d359 100644
--- a/Source/WebKit2/WebKit2.pro
+++ b/Source/WebKit2/WebKit2.pro
@@ -12,10 +12,3 @@ target.file = Target.pri
 SUBDIRS += derived_sources target
 
 addStrictSubdirOrderBetween(derived_sources, target)
-
-have?(QTQUICK) {
-    webkit2qml.file = WebKit2QML.pri
-    SUBDIRS += webkit2qml
-
-    addStrictSubdirOrderBetween(target, webkit2qml)
-}
diff --git a/Source/WebKit2/WebKit2QML.pri b/Source/WebKit2/WebKit2QML.pri
deleted file mode 100644
index bd805e94e..000000000
--- a/Source/WebKit2/WebKit2QML.pri
+++ /dev/null
@@ -1,80 +0,0 @@
-# -------------------------------------------------------------------
-# Target file for the WebKit2 QML static library
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-TEMPLATE = lib
-TARGET = WebKit2QML
-
-WEBKIT += wtf javascriptcore webcore webkit2
-
-load(webkit_modules)
-
-SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit2
-
-# Remove include paths that point to directories containing
-# internal API, to prevent the accidental inclusion.
-INCLUDEPATH -= \
-    $$SOURCE_DIR \
-    $$SOURCE_DIR/Platform \
-    $$SOURCE_DIR/Platform/CoreIPC \
-    $$SOURCE_DIR/Platform/qt \
-    $$SOURCE_DIR/Shared \
-    $$SOURCE_DIR/Shared/linux/SandboxProcess \
-    $$SOURCE_DIR/Shared/Authentication \
-    $$SOURCE_DIR/Shared/CoordinatedGraphics \
-    $$SOURCE_DIR/Shared/CoreIPCSupport \
-    $$SOURCE_DIR/Shared/Downloads \
-    $$SOURCE_DIR/Shared/Downloads/qt \
-    $$SOURCE_DIR/Shared/Network \
-    $$SOURCE_DIR/Shared/Plugins \
-    $$SOURCE_DIR/Shared/Plugins/Netscape \
-    $$SOURCE_DIR/Shared/qt \
-    $$SOURCE_DIR/UIProcess \
-    $$SOURCE_DIR/UIProcess/API/qt \
-    $$SOURCE_DIR/UIProcess/Authentication \
-    $$SOURCE_DIR/UIProcess/CoordinatedGraphics \
-    $$SOURCE_DIR/UIProcess/Downloads \
-    $$SOURCE_DIR/UIProcess/InspectorServer \
-    $$SOURCE_DIR/UIProcess/InspectorServer/qt \
-    $$SOURCE_DIR/UIProcess/Launcher \
-    $$SOURCE_DIR/UIProcess/Notifications \
-    $$SOURCE_DIR/UIProcess/Plugins \
-    $$SOURCE_DIR/UIProcess/Storage \
-    $$SOURCE_DIR/UIProcess/qt \
-    $$SOURCE_DIR/UIProcess/texmap \
-    $$SOURCE_DIR/WebProcess \
-    $$SOURCE_DIR/WebProcess/ApplicationCache \
-    $$SOURCE_DIR/WebProcess/Battery \
-    $$SOURCE_DIR/WebProcess/Cookies \
-    $$SOURCE_DIR/WebProcess/Cookies/qt \
-    $$SOURCE_DIR/WebProcess/FullScreen \
-    $$SOURCE_DIR/WebProcess/Geolocation \
-    $$SOURCE_DIR/WebProcess/IconDatabase \
-    $$SOURCE_DIR/WebProcess/InjectedBundle \
-    $$SOURCE_DIR/WebProcess/InjectedBundle/DOM \
-    $$SOURCE_DIR/WebProcess/InjectedBundle/API/c \
-    $$SOURCE_DIR/WebProcess/MediaCache \
-    $$SOURCE_DIR/WebProcess/NetworkInfo \
-    $$SOURCE_DIR/WebProcess/Notifications \
-    $$SOURCE_DIR/WebProcess/Plugins \
-    $$SOURCE_DIR/WebProcess/Plugins/Netscape \
-    $$SOURCE_DIR/WebProcess/ResourceCache \
-    $$SOURCE_DIR/WebProcess/Storage \
-    $$SOURCE_DIR/WebProcess/WebCoreSupport \
-    $$SOURCE_DIR/WebProcess/WebCoreSupport/qt \
-    $$SOURCE_DIR/WebProcess/WebPage \
-    $$SOURCE_DIR/WebProcess/WebPage/CoordinatedGraphics \
-    $$SOURCE_DIR/WebProcess/qt \
-    $$SOURCE_DIR/PluginProcess
-
-CONFIG += staticlib
-
-SOURCES += \
-        UIProcess/API/qt/qwebnavigationhistory.cpp
-
-HEADERS += \
-        UIProcess/API/qt/qwebnavigationhistory_p.h \
-        UIProcess/API/qt/qwebnavigationhistory_p_p.h
-
diff --git a/Source/api.pri b/Source/api.pri
index f1f2a0922..ccd206cc3 100644
--- a/Source/api.pri
+++ b/Source/api.pri
@@ -15,10 +15,7 @@ WEBKIT_DESTDIR = $${ROOT_BUILD_DIR}/lib
 WEBKIT += wtf javascriptcore webcore
 
 build?(webkit1): WEBKIT += webkit1
-build?(webkit2) {
-    WEBKIT += webkit2
-    have?(QTQUICK): WEBKIT += webkit2qml
-}
+build?(webkit2): WEBKIT += webkit2
 
 # Ensure that changes to the WebKit1 and WebKit2 API will trigger a qmake of this
 # file, which in turn runs syncqt to update the forwarding headers.
diff --git a/Tools/qmake/mkspecs/features/webkit_modules.prf b/Tools/qmake/mkspecs/features/webkit_modules.prf
index 2a520d7f4..189387835 100644
--- a/Tools/qmake/mkspecs/features/webkit_modules.prf
+++ b/Tools/qmake/mkspecs/features/webkit_modules.prf
@@ -7,7 +7,7 @@
 
 # Reorder libraries so that the link and include order is correct,
 # and make sure the case matches the original case.
-libraries = WebKit1 WebKit2QML WebKit2 WebCore ANGLE JavaScriptCore WTF
+libraries = WebKit1 WebKit2 WebCore ANGLE JavaScriptCore WTF
 for(library, libraries) {
     contains(WEBKIT, $$lower($$library)) {
         WEBKIT -= $$lower($$library)
diff --git a/Tools/qmake/mkspecs/modules/webkit2qml.prf b/Tools/qmake/mkspecs/modules/webkit2qml.prf
deleted file mode 100644
index 06566f4b9..000000000
--- a/Tools/qmake/mkspecs/modules/webkit2qml.prf
+++ /dev/null
@@ -1,9 +0,0 @@
-# -------------------------------------------------------------------
-# Module file for WebKit2, used by targets that depend on WebKit2
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-WEBKIT.webkit2qml.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/WebKit2
-
-#include($${WEBKIT.webkit2.root_source_dir}/WebKit2QML.pri)