Import QtWebKit commit 143b469188bde226d5e70cff5f01699b8a29d865

Change-Id: I31b194474a8bb5668f1305dda5d9f79d81d1e0d5
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

4 files changed, 302 insertions, 193 deletions

diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
index 65c1ff1c1..10f595e77 100644
--- a/Source/WebKit/PlatformQt.cmake
+++ b/Source/WebKit/PlatformQt.cmake
@@ -419,6 +419,16 @@ install(
 )
 
 file(GLOB WebKit_PRIVATE_HEADERS qt/Api/*_p.h)
+
+# This is needed to install WK2 private headers into macOS bundle
+if (ENABLE_WEBKIT2)
+    file(GLOB WebKit2_PRIVATE_HEADERS "${WEBKIT2_DIR}/UIProcess/API/qt/*_p.h")
+    foreach (_src ${WebKit2_PRIVATE_HEADERS})
+        set_property(SOURCE ${_src} PROPERTY SKIP_AUTOMOC ON)
+    endforeach ()
+    list(APPEND WebKit_PRIVATE_HEADERS ${WebKit2_PRIVATE_HEADERS})
+endif ()
+
 install(
     FILES
         ${WebKit_PRIVATE_HEADERS}
diff --git a/Tools/qmake/projects/generate_forwarding_pris.pro b/Tools/qmake/projects/generate_forwarding_pris.pro
index 3618699d8..2f5ea4fd5 100644
--- a/Tools/qmake/projects/generate_forwarding_pris.pro
+++ b/Tools/qmake/projects/generate_forwarding_pris.pro
@@ -26,12 +26,28 @@ defineTest(writeForwardingPri) {
     write_file($$forwarding_pri_name, FORWARDING_PRI_CONTENTS)|error()
 }
 
+defineTest(writeWebKitPrivateForwardingPri) {
+    module = webkit_private
+    configuration = $$1
+    cmake_build_dir = $$ROOT_BUILD_DIR/$$configuration
+    forwarding_pri_name = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_lib_$${module}.pri
+
+    FORWARDING_PRI_CONTENTS += \
+        "include($$cmake_build_dir/Source/WebKit/qt_lib_$${module}.pri)" \
+        "QT.$${module}.priority = 1" \
+        "QT.$${module}.includes = $$cmake_build_dir/DerivedSources/ForwardingHeaders/QtWebKit $$ROOT_WEBKIT_DIR/Source"
+
+    message("Writing $$forwarding_pri_name")
+    write_file($$forwarding_pri_name, FORWARDING_PRI_CONTENTS)|error()
+}
+
 
 debug_and_release {
     !build_pass {
         # Use release build in case of debug_and_release
         writeForwardingPri(webkit, release)
         writeForwardingPri(webkitwidgets, release)
+        writeWebKitPrivateForwardingPri(release)
     }
 } else {
     CONFIG(debug, debug|release) {
@@ -41,4 +57,5 @@ debug_and_release {
     }
     writeForwardingPri(webkit, $$configuration)
     writeForwardingPri(webkitwidgets, $$configuration)
+    writeWebKitPrivateForwardingPri($$configuration)
 }
diff --git a/Tools/qt/QtBinaryChecklist.txt b/Tools/qt/QtBinaryChecklist.txt
index ee6985832..25c4a0c28 100644
--- a/Tools/qt/QtBinaryChecklist.txt
+++ b/Tools/qt/QtBinaryChecklist.txt
@@ -1,30 +1,35 @@
-include/QtWebKit/{{version}}/QtWebKit/private/qhttpheader_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qquicknetworkreply_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qquicknetworkrequest_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qquickurlschemedelegate_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qquickwebpage_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qquickwebpage_p_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qquickwebview_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qquickwebview_p_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qtwebsecurityorigin_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebchannelwebkittransport_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebdatabase_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebdownloaditem_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebdownloaditem_p_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebelement_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebhistory_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebiconimageprovider_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebkittest_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebloadrequest_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebnavigationhistory_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebnavigationhistory_p_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebnavigationrequest_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebpermissionrequest_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebplugindatabase_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebpreferences_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebpreferences_p_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebscriptworld_p.h
-include/QtWebKit/{{version}}/QtWebKit/private/qwebsecurityorigin_p.h
+{% if wk2 %}
+    include/QtWebKit/{{version}}/QtWebKit/private/qhttpheader_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qquicknetworkreply_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qquicknetworkrequest_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qquickurlschemedelegate_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qquickwebpage_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qquickwebpage_p_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qquickwebview_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qquickwebview_p_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qtwebsecurityorigin_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebchannelwebkittransport_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebdatabase_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebdownloaditem_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebdownloaditem_p_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebelement_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebhistory_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebiconimageprovider_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebkittest_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebloadrequest_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebnavigationhistory_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebnavigationhistory_p_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebnavigationrequest_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebpermissionrequest_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebplugindatabase_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebpreferences_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebpreferences_p_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebscriptworld_p.h
+    include/QtWebKit/{{version}}/QtWebKit/private/qwebsecurityorigin_p.h
+    qml/QtWebKit/plugins.qmltypes
+    qml/QtWebKit/qmldir
+    qml/QtWebKit/experimental/qmldir
+{% endif %}
 include/QtWebKit/QWebDatabase
 include/QtWebKit/QWebElement
 include/QtWebKit/QWebElementCollection
@@ -79,157 +84,207 @@ include/QtWebKitWidgets/qwebpage.h
 include/QtWebKitWidgets/qwebview.h
 lib/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
 lib/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
-lib/cmake/Qt5WebKit/WebKitTargets-release.cmake
 lib/cmake/Qt5WebKit/WebKitTargets.cmake
 lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
 lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
-lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake
 lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake
 mkspecs/modules/qt_lib_webkit.pri
 mkspecs/modules/qt_lib_webkit_private.pri
 mkspecs/modules/qt_lib_webkitwidgets.pri
 mkspecs/modules/qt_lib_webkitwidgets_private.pri
-qml/QtWebKit/plugins.qmltypes
-qml/QtWebKit/qmldir
-qml/QtWebKit/experimental/qmldir
-
 
-{% if os=="linux" %}
 {% if release %}
-lib/libQt5WebKit.so
-lib/libQt5WebKit.so.{{major}}
-lib/libQt5WebKit.so.{{version}}
-lib/libQt5WebKitWidgets.so
-lib/libQt5WebKitWidgets.so.{{major}}
-lib/libQt5WebKitWidgets.so.{{version}}
-libexec/QtWebPluginProcess
+    lib/cmake/Qt5WebKit/WebKitTargets-release.cmake
+    lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake
 {% endif %}
 
-{% if debug %}
-lib/libQt5WebKit.so.{{version}}.debug
-lib/libQt5WebKitWidgets.so.{{version}}.debug
-{% endif %}
+{% if os=="linux" %}
+    {% if release %}
+        lib/libQt5WebKit.so
+        lib/libQt5WebKit.so.{{major}}
+        lib/libQt5WebKit.so.{{version}}
+        lib/libQt5WebKitWidgets.so
+        lib/libQt5WebKitWidgets.so.{{major}}
+        lib/libQt5WebKitWidgets.so.{{version}}
+        libexec/QtWebPluginProcess
+    {% endif %}
+
+    {% if force_debug_info %}
+        lib/libQt5WebKit.so.{{version}}.debug
+        lib/libQt5WebKitWidgets.so.{{version}}.debug
+    {% endif %}
 
 {% elif os=="macos" %}
-lib/QtWebKit.framework/Headers
-lib/QtWebKit.framework/QtWebKit
-lib/QtWebKit.framework/Resources
-lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qhttpheader_p.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebdatabase_p.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebelement_p.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebhistory_p.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebplugindatabase_p.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebscriptworld_p.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebsecurityorigin_p.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebDatabase
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebElement
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebElementCollection
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebFullScreenRequest
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebFullScreenVideoHandler
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHapticFeedbackPlayer
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHistory
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHistoryInterface
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHistoryItem
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebKitPlatformPlugin
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebNotificationData
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebNotificationPresenter
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebPluginFactory
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSecurityOrigin
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSelectData
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSelectMethod
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSettings
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSpellChecker
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebTouchModifier
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QtWebKit
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QtWebKitDepends
-lib/QtWebKit.framework/Versions/{{major}}/Headers/QtWebKitVersion
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qtwebkitversion.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebdatabase.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebelement.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebfullscreenrequest.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebhistory.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebhistoryinterface.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebkitglobal.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebkitplatformplugin.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebpluginfactory.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebsecurityorigin.h
-lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebsettings.h
-lib/QtWebKit.framework/Versions/{{major}}/QtWebKit
-lib/QtWebKit.framework/Versions/{{major}}/Resources/Info.plist
-lib/QtWebKit.framework/Versions/Current
-lib/QtWebKitWidgets.framework/Headers
-lib/QtWebKitWidgets.framework/QtWebKitWidgets
-lib/QtWebKitWidgets.framework/Resources
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebframe_p.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebinspector_p.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebpage_p.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebviewaccessible_p.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QGraphicsWebView
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebFrame
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebHitTestResult
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebInspector
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebPage
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebView
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QtWebKitWidgets
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QtWebKitWidgetsDepends
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QtWebKitWidgetsVersion
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qgraphicswebview.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qtwebkitwidgetsversion.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebframe.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebinspector.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebpage.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebview.h
-lib/QtWebKitWidgets.framework/Versions/{{major}}/QtWebKitWidgets
-lib/QtWebKitWidgets.framework/Versions/{{major}}/Resources/Info.plist
-lib/QtWebKitWidgets.framework/Versions/Current
+    lib/QtWebKit.framework/Headers
+    lib/QtWebKit.framework/QtWebKit
+    lib/QtWebKit.framework/Resources
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qhttpheader_p.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebdatabase_p.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebelement_p.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebhistory_p.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebplugindatabase_p.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebscriptworld_p.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebsecurityorigin_p.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebDatabase
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebElement
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebElementCollection
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebFullScreenRequest
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebFullScreenVideoHandler
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHapticFeedbackPlayer
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHistory
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHistoryInterface
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebHistoryItem
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebKitPlatformPlugin
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebNotificationData
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebNotificationPresenter
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebPluginFactory
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSecurityOrigin
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSelectData
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSelectMethod
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSettings
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebSpellChecker
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QWebTouchModifier
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QtWebKit
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QtWebKitDepends
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/QtWebKitVersion
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qtwebkitversion.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebdatabase.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebelement.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebfullscreenrequest.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebhistory.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebhistoryinterface.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebkitglobal.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebkitplatformplugin.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebpluginfactory.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebsecurityorigin.h
+    lib/QtWebKit.framework/Versions/{{major}}/Headers/qwebsettings.h
+    {% if wk2 %}
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qquicknetworkreply_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qquicknetworkrequest_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qquickurlschemedelegate_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qquickwebpage_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qquickwebpage_p_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qquickwebview_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qquickwebview_p_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qtwebsecurityorigin_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebchannelwebkittransport_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebdownloaditem_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebdownloaditem_p_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebiconimageprovider_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebkittest_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebloadrequest_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebnavigationhistory_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebnavigationhistory_p_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebnavigationrequest_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebpermissionrequest_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebpreferences_p.h
+        lib/QtWebKit.framework/Versions/{{major}}/Headers/{{version}}/QtWebKit/private/qwebpreferences_p_p.h
+    {% endif %}
+    lib/QtWebKit.framework/Versions/{{major}}/QtWebKit
+    lib/QtWebKit.framework/Versions/{{major}}/Resources/Info.plist
+    lib/QtWebKit.framework/Versions/Current
+    lib/QtWebKitWidgets.framework/Headers
+    lib/QtWebKitWidgets.framework/QtWebKitWidgets
+    lib/QtWebKitWidgets.framework/Resources
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebframe_p.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebinspector_p.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebpage_p.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/{{version}}/QtWebKitWidgets/private/qwebviewaccessible_p.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QGraphicsWebView
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebFrame
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebHitTestResult
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebInspector
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebPage
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QWebView
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QtWebKitWidgets
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QtWebKitWidgetsDepends
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/QtWebKitWidgetsVersion
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qgraphicswebview.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qtwebkitwidgetsversion.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebframe.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebinspector.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebpage.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Headers/qwebview.h
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/QtWebKitWidgets
+    lib/QtWebKitWidgets.framework/Versions/{{major}}/Resources/Info.plist
+    lib/QtWebKitWidgets.framework/Versions/Current
 
 {% elif os=="windows" %}
+    bin/icudt{{icu_version}}.dll
+    bin/icuin{{icu_version}}.dll
+    bin/icuuc{{icu_version}}.dll
+    {% if wk2 %}
+        bin/QtWebNetworkProcess.exe
+        bin/QtWebProcess.exe
+        bin/QtWebStorageProcess.exe
+    {% endif %}
 
-bin/QtWebNetworkProcess.exe
-bin/QtWebProcess.exe
-bin/QtWebStorageProcess.exe
-bin/icudt65.dll
-bin/icuin65.dll
-bin/icuuc65.dll
-bin/libxml2.dll
-bin/libxslt.dll
+    {% if toolchain=="msvc" %}
+        bin/libxml2.dll
+        bin/libxslt.dll
+    {% elif toolchain=="mingw" %}
+        bin/libxslt-1.dll
+        bin/libxml2-2.dll
+    {% endif %}
 
-{% if release %}
-bin/Qt5WebKit.dll
-bin/Qt5WebKitWidgets.dll
-lib/Qt5WebKit.lib
-lib/Qt5WebKitWidgets.lib
-qml/QtWebKit/experimental/qmlwebkitexperimentalplugin.dll
-qml/QtWebKit/qmlwebkitplugin.dll
-{% endif %}
+    {% if release %}
+        bin/Qt5WebKit.dll
+        bin/Qt5WebKitWidgets.dll
 
-{% if debug %}
-bin/Qt5WebKitWidgetsd.dll
-bin/Qt5WebKitd.dll
-bin/Qt5WebKit.pdb
-bin/Qt5WebKitd.pdb
-bin/Qt5WebKitWidgets.pdb
-bin/Qt5WebKitWidgetsd.pdb
-lib/Qt5WebKitd.lib
-lib/Qt5WebKitWidgetsd.lib
-lib/cmake/Qt5WebKit/WebKitTargets-debug.cmake
-lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-debug.cmake
-qml/QtWebKit/experimental/qmlwebkitexperimentalplugind.dll
-qml/QtWebKit/qmlwebkitplugind.dll
-{% endif %}
+        {% if force_debug_info and toolchain=="msvc" %}
+            bin/Qt5WebKit.pdb
+            bin/Qt5WebKitWidgets.pdb
+        {% endif %}
+
+        {% if toolchain=="msvc" %}
+            lib/Qt5WebKit.lib
+            lib/Qt5WebKitWidgets.lib
+        {% elif toolchain=="mingw" %}
+            lib/libQt5WebKitWidgets.a
+            lib/libQt5WebKit.a
+        {% endif %}
+
+        qml/QtWebKit/experimental/qmlwebkitexperimentalplugin.dll
+        qml/QtWebKit/qmlwebkitplugin.dll
+    {% endif %}
+
+    {% if debug %}
+        lib/cmake/Qt5WebKit/WebKitTargets-debug.cmake
+        lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-debug.cmake
+
+        {% if toolchain=="msvc" %}
+            bin/Qt5WebKitWidgetsd.dll
+            bin/Qt5WebKitd.dll
+        {% endif %}
+
+        {% if force_debug_info and toolchain=="msvc" %}
+            bin/Qt5WebKitd.pdb
+            bin/Qt5WebKitWidgetsd.pdb
+        {% endif %}
+
+        {% if toolchain=="msvc" %}
+            lib/Qt5WebKitd.lib
+            lib/Qt5WebKitWidgetsd.lib
+            qml/QtWebKit/experimental/qmlwebkitexperimentalplugind.dll
+            qml/QtWebKit/qmlwebkitplugind.dll
+        {% endif %}
+
+    {% endif %}
 
 {% endif %}
 
 
 {% if os=="linux" or os=="macos" %}
-libexec/QtWebNetworkProcess
-libexec/QtWebProcess
-libexec/QtWebStorageProcess
-qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
-qml/QtWebKit/libqmlwebkitplugin.so
+    {% if wk2 %}
+        libexec/QtWebNetworkProcess
+        libexec/QtWebProcess
+        libexec/QtWebStorageProcess
+        qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
+        qml/QtWebKit/libqmlwebkitplugin.so
+    {% endif %}
 {% endif %}
 
 {% if os=="linux" or os=="windows" %}
-lib/pkgconfig/Qt5WebKit.pc
-lib/pkgconfig/Qt5WebKitWidgets.pc
+    lib/pkgconfig/Qt5WebKit.pc
+    lib/pkgconfig/Qt5WebKitWidgets.pc
 {% endif %}
diff --git a/Tools/qt/installed-files-checker.py b/Tools/qt/installed-files-checker.py
index 2144e9c32..96ba18ee3 100755
--- a/Tools/qt/installed-files-checker.py
+++ b/Tools/qt/installed-files-checker.py
@@ -29,95 +29,122 @@ import argparse
 import os
 
 parser = argparse.ArgumentParser(description='Checker for Qtwebkit Binaries')
-parser.add_argument("--version", help=r"Version history of the form {major_version}.{minor_version}.{ver_patch}", required=True)
-parser.add_argument("--qt", help="Root of Qt installation")
-parser.add_argument("--build", help="Root of build directory")
-parser.add_argument("--os", help="Operating system", required=True, choices=[ "linux", "macos", "windows" ])
-parser.add_argument("--template", help='Relative path to template file', default="template/QtBinaryChecklist.txt")
+parser.add_argument(
+    "--version", help=r"Version history of the form {major_version}.{minor_version}.{ver_patch}", required=True)
+parser.add_argument("--install_prefix", help="QtWebkit Install Prefix")
+parser.add_argument("--os", help="Operating system",
+                    required=True, choices=["linux", "macos", "windows"])
+parser.add_argument("--template", help='Relative path to template file',
+                    default="template/QtBinaryChecklist.txt")
 parser.add_argument("--release", help='Release build', action='store_true')
 parser.add_argument("--debug", help='Debug build', action='store_true')
-parser.add_argument("--qt_install_header", help='Qt headers install path')
+parser.add_argument("--qt_install_headers", help='Qt headers install path')
 parser.add_argument("--qt_install_libs", help='Qt libraries install path')
 parser.add_argument("--qt_install_archdata", help='Qt archdata install path')
 parser.add_argument("--qt_install_libexecs", help='Qt libexecs install path')
+parser.add_argument("--force_debug_info",
+                    help='Enable debug symbols for release builds', action='store_true')
+parser.add_argument("--icu_version", help='ICU version')
+parser.add_argument(
+    "--toolchain", help='Toolchain used e.g. msvc, mingw for windows')
+parser.add_argument("-v", "--verbose", action='store_true',
+                    help='Print paths of checked files')
+parser.add_argument("--no-wk2", action="store_false", dest="wk2",
+                    help='Disable wk2 specific files')
 
 args = parser.parse_args()
 
+if not args.release and not args.debug:
+    print("Please specify at least one build type!")
+    exit(1)
+
 template_abspath = os.path.abspath(args.template)
 template_folder = os.path.dirname(template_abspath)
 template_name = os.path.basename(template_abspath)
 
-file_loader = FileSystemLoader(template_folder) # directory of template file
+file_loader = FileSystemLoader(template_folder)  # directory of template file
 env = Environment(loader=file_loader)
 
-template = env.get_template(template_name) # load template file
+template = env.get_template(template_name)  # load template file
 
 major, minor, patch = args.version.split('.')
 
 check_list = template.render(os=args.os,
-    major=major, version=args.version, release=args.release, debug=args.debug).split('\n')
+                             major=major, version=args.version, release=args.release, debug=args.debug,
+                             icu_version=args.icu_version, wk2=args.wk2,
+                             force_debug_info=args.force_debug_info, toolchain=args.toolchain).split('\n')
+
 
-file_count = {"linux_Release": 108, "windows_Debug": 118,"windows_Release":110, "macos_Release": 170}
+def print_error(msg):
+    print(msg, file=sys.stderr)
 
 
-def verify_linux(check_list):
+def custom_args_verify(check_list):
     error_list = []
-    count = 0
 
     for line in check_list:
         if line.rstrip():
+            line = line.lstrip()
+
+            if args.verbose:
+                print(line)
+
             if line.startswith('include/'):
-                chk_path = os.path.join(args.qt_install_header, line[len('include/'):])
+                chk_path = os.path.join(
+                    args.qt_install_headers, line[len('include/'):])
             elif line.startswith('lib/'):
-                chk_path = os.path.join(args.qt_install_libs, line[len('lib/'):])
+                chk_path = os.path.join(
+                    args.qt_install_libs, line[len('lib/'):])
             elif line.startswith('mkspecs/') or line.startswith('qml/'):
                 chk_path = os.path.join(args.qt_install_archdata, line)
             elif line.startswith('libexec/'):
-                chk_path = os.path.join(args.qt_install_libexecs, line[len('libexec/'):])
-
-            count+=1
+                chk_path = os.path.join(
+                    args.qt_install_libexecs, line[len('libexec/'):])
 
             if not os.path.exists(chk_path):
                 error_list.append(chk_path)
+                if args.verbose:
+                    print(line, "\t", "fail")
+            else:
+                if args.verbose:
+                    print(line, "\t", "ok")
+
+    return error_list
 
-    return [error_list, count]
 
-def verify_windows_mac(check_list):
+def default_verify(check_list):
     error_list = []
-    count = 0
 
-    build=os.path.join(os.getcwd(),args.build)
     for line in check_list:
         if line.rstrip():
-            if line.startswith('bin'):
-                chk_path = os.path.join(build, line)
-            else:
-                chk_path = os.path.join(args.qt, line)
+            line = line.lstrip()
 
-            count+=1
+            chk_path = os.path.join(args.install_prefix, line)
             if not os.path.exists(chk_path):
                 error_list.append(chk_path)
+                if args.verbose:
+                    print(line, "\t", "fail")
+            else:
+                if args.verbose:
+                    print(line, "\t", "ok")
 
-    return [error_list, count]
+    return error_list
 
 
-if args.os == 'linux':
-    res = verify_linux(check_list)
-elif args.os == 'windows' or args.os == 'macos':
-    res = verify_windows_mac(check_list)
+if not args.qt_install_headers and not args.install_prefix:
+    print_error("Specify either the install prefix or custom locations")
+    exit(1)
 
-build_type = 'Debug' if args.debug else 'Release'
+res = custom_args_verify(
+    check_list) if args.qt_install_headers else default_verify(check_list)
 
-print("Verified {0}/{1} files".format(res[1],file_count[args.os+'_'+build_type]))
-if len(res[0])!=0:
-    print("Errors found files below are missing:")
-    for err in res[0]:
-        print(err)
+if len(res) != 0:
+    print_error("Errors found files below are missing:")
+    for err in res:
+        print_error(err)
     exit(1)
 
-print("All files are installed properly")
-
 
 #python3 installed-files-checker.py --version 5.212.0 --build /mnt/c/qtwebkit/build --os linux
 #
-# py installed-files-checker.py --version 5.20.0 --qt "C:/Qt/5.14.2/msvc2017_64" --build "C:/qtwebkit/build/" --os windows
+# py installed-files-checker.py --version 5.20.0 --qt "C:/Qt/5.14.2/msvc2017_64" --build "C:/qtwebkit/build/" --os windows --icu_version=65