Merge remote-tracking branch 'origin/5.212' into devHEADdev

Change-Id: I2b773e6958cf1d3699ff7887f2807572f1dafa8d

130 files changed, 313 insertions, 31 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 44b1ec1f4..e24564d22 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,3 +3,5 @@ QMAKEPATH += $$PWD/Tools/qmake
 
 ROOT_WEBKIT_DIR = $$PWD
 ROOT_BUILD_DIR = $$shadowed($$PWD)
+
+MODULE_VERSION = 5.13.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb92a7a5c..31a2ea1fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,6 +141,11 @@ include(WebKitCommon)
 # -----------------------------------------------------------------------------
 if (ENABLE_API_TESTS)
     enable_testing()
+
+    # Qt API tests are at top level because of Coin requirements
+    if (${PORT} STREQUAL "Qt")
+        add_subdirectory(tests)
+    endif ()
 endif ()
 
 # -----------------------------------------------------------------------------
diff --git a/Source/PlatformQt.cmake b/Source/PlatformQt.cmake
index 61648331b..c99d89d70 100644
--- a/Source/PlatformQt.cmake
+++ b/Source/PlatformQt.cmake
@@ -54,6 +54,15 @@ if (USE_MINIMAL_DEBUG_INFO_MSVC AND MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
     endif ()
 endif ()
 
+if (FORCE_DEBUG_INFO)
+    if (COMPILER_IS_GCC_OR_CLANG)
+        if (NOT APPLE)
+            target_compile_options(WebKit        PRIVATE -fdebug-types-section)
+            target_compile_options(WebKit2       PRIVATE -fdebug-types-section)
+        endif ()
+    endif ()
+endif ()
+
 # GTest
 
 if (TARGET gtest)
@@ -78,6 +87,29 @@ target_include_directories(WebKitWidgets INTERFACE
     $<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets>
 )
 
+if (QT_ORIGIN_RPATH)
+    set(WEBKIT_SHARED_LIBRARY_TARGETS WebKit)
+
+    if (TARGET WebKitWidgets)
+        list(APPEND WEBKIT_SHARED_LIBRARY_TARGETS WebKitWidgets)
+    endif ()
+
+    if (TARGET WebKit2)
+        set(WEBKIT2_EXECUTABLES WebProcess NetworkProcess)
+        if (ENABLE_PLUGIN_PROCESS)
+            list(APPEND WEBKIT2_EXECUTABLES PluginProcess)
+        endif ()
+        if (ENABLE_DATABASE_PROCESS)
+            list(APPEND WEBKIT2_EXECUTABLES DatabaseProcess)
+        endif ()
+        set_target_properties(${WEBKIT2_EXECUTABLES} PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
+        set_target_properties(qmlwebkitplugin PROPERTIES INSTALL_RPATH "\$ORIGIN/../../lib")
+        set_target_properties(qmlwebkitexperimentalplugin PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib")
+    endif ()
+
+    set_target_properties(${WEBKIT_SHARED_LIBRARY_TARGETS} PROPERTIES INSTALL_RPATH "\$ORIGIN")
+endif ()
+
 set(QTWEBKIT_PACKAGE_INIT "
 macro(find_dependency_with_major_and_minor _dep _major _minor)
     find_dependency(\${_dep} \"\${_major}.\${_minor}\")
@@ -153,17 +185,18 @@ install(FILES
     COMPONENT Data
 )
 
+# We need to install separate config files for debug and release, so use "Code" component
 install(EXPORT WebKitTargets
     FILE WebKitTargets.cmake
     NAMESPACE Qt5::
     DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
-    COMPONENT Data
+    COMPONENT Code
 )
 install(EXPORT Qt5WebKitWidgetsTargets
     FILE Qt5WebKitWidgetsTargets.cmake
     NAMESPACE Qt5::
     DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
-    COMPONENT Data
+    COMPONENT Code
 )
 
 # Documentation
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index 1bca2d0a6..19355f166 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
     unsigned i = 0;
 
     UChar32 c;
-    U16_NEXT(characters, i, length, c)
+    U16_NEXT(characters, i, length, c);
     if (!isValidNameStart(c))
         return false;
 
     while (i < length) {
-        U16_NEXT(characters, i, length, c)
+        U16_NEXT(characters, i, length, c);
         if (!isValidNamePart(c))
             return false;
     }
@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
 
     for (unsigned i = 0; i < length;) {
         UChar32 c;
-        U16_NEXT(qualifiedName, i, length, c)
+        U16_NEXT(qualifiedName, i, length, c);
         if (c == ':') {
             if (sawColon) {
                 ec = NAMESPACE_ERR;
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 6bf343087..72db3ebaf 100644
--- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1600,7 +1600,7 @@ void GraphicsContext::set3DTransform(const TransformationMatrix& transform)
 
 void GraphicsContext::setURLForRect(const URL& url, const IntRect& rect)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) && !defined(QT_NO_PDF)
     if (paintingDisabled())
         return;
 
diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 04117d563..c845856da 100644
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -64,6 +64,11 @@ if (${PORT} STREQUAL "Qt")
         install(FILES $<TARGET_PDB_FILE:WebKit> DESTINATION "${BIN_INSTALL_DIR}" OPTIONAL)
     endif ()
 
+    if (SEPARATE_DEBUG_INFO)
+        QTWEBKIT_SEPARATE_DEBUG_INFO(WebKit WebKit_DEBUG_INFO)
+        install(FILES ${WebKit_DEBUG_INFO} DESTINATION "${LIB_INSTALL_DIR}" OPTIONAL)
+    endif ()
+
     if (NOT MSVC)
         ADD_PREFIX_HEADER(WebKit "${WEBKIT_DIR}/qt/WebKitPrefix.h")
     endif ()
diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
index 2bd6342be..9aed9906e 100644
--- a/Source/WebKit/PlatformQt.cmake
+++ b/Source/WebKit/PlatformQt.cmake
@@ -858,6 +858,11 @@ if (MSVC AND NOT QT_STATIC_BUILD)
     install(FILES $<TARGET_PDB_FILE:WebKitWidgets> DESTINATION "${BIN_INSTALL_DIR}" OPTIONAL)
 endif ()
 
+if (SEPARATE_DEBUG_INFO)
+    QTWEBKIT_SEPARATE_DEBUG_INFO(WebKitWidgets WebKitWidgets_DEBUG_INFO)
+    install(FILES ${WebKitWidgets_DEBUG_INFO} DESTINATION "${LIB_INSTALL_DIR}" OPTIONAL)
+endif ()
+
 if (NOT MSVC AND WIN32)
     ADD_PREFIX_HEADER(WebKitWidgets "qt/WebKitWidgetsPrefix.h")
 endif ()
@@ -904,7 +909,3 @@ endif ()
 if (ENABLE_WEBKIT2)
     add_subdirectory(qt/declarative)
 endif ()
-
-if (ENABLE_API_TESTS)
-    add_subdirectory(qt/tests)
-endif ()
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro b/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro
new file mode 100644
index 000000000..4a8d86f80
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro
@@ -0,0 +1,4 @@
+include(../tests.pri)
+SOURCES += $${TARGET}.cpp
+QT += webkit-private
+DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro b/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro
new file mode 100644
index 000000000..02dc197c7
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+SOURCES += $${TARGET}.cpp
+QT += webkit-private
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro
new file mode 100644
index 000000000..e8ac901f1
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro
@@ -0,0 +1,18 @@
+include(../tests.pri)
+SOURCES += tst_qmltests.cpp
+TARGET = tst_qmltests_DesktopBehavior
+OBJECTS_DIR = .obj_DesktopBehavior
+
+QT += webkit-private
+CONFIG += testcase
+
+QT += qmltest
+
+DEFINES += DISABLE_FLICKABLE_VIEWPORT=1
+# Test the QML files under DesktopBehavior in the source repository.
+DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}DesktopBehavior\\\"\"
+DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
+
+OTHER_FILES += \
+    DesktopBehavior/* \
+    common/*
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro
new file mode 100644
index 000000000..6c67da96e
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro
@@ -0,0 +1,19 @@
+include(../tests.pri)
+SOURCES += tst_qmltests.cpp
+TARGET = tst_qmltests_WebView
+OBJECTS_DIR = .obj_WebView
+
+QT += webkit-private
+CONFIG += testcase
+
+QT += qmltest
+
+# Test the QML files under WebView in the source repository.
+DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}WebView\\\"\"
+DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
+
+OTHER_FILES += \
+    WebView/* \
+    common/*
+
+RESOURCES = resources.qrc
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro
new file mode 100644
index 000000000..8ddc4484e
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += DesktopBehavior.pro WebView.pro
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro b/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro
new file mode 100644
index 000000000..4a8d86f80
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro
@@ -0,0 +1,4 @@
+include(../tests.pri)
+SOURCES += $${TARGET}.cpp
+QT += webkit-private
+DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro b/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro
new file mode 100644
index 000000000..02dc197c7
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+SOURCES += $${TARGET}.cpp
+QT += webkit-private
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/tests.pri b/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
new file mode 100644
index 000000000..a1133530d
--- /dev/null
+++ b/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
@@ -0,0 +1,20 @@
+TEMPLATE = app
+
+VPATH += $$_PRO_FILE_PWD_
+TARGET = tst_$$TARGET
+
+INCLUDEPATH += $$PWD
+SOURCES +=  ../util.cpp
+
+QT += testlib webkit
+have?(QTQUICK) {
+    QT += qml quick quick-private
+    HEADERS += ../bytearraytestdata.h \
+               ../util.h
+
+    SOURCES += ../bytearraytestdata.cpp
+}
+WEBKIT += wtf # For platform macros
+
+DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD\\\" \
+           QWP_PATH=\\\"$${ROOT_BUILD_DIR}/bin\\\"
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
index 7e1e55340..ec6081de0 100644
--- a/Source/cmake/OptionsQt.cmake
+++ b/Source/cmake/OptionsQt.cmake
@@ -20,7 +20,7 @@ if (QT_CONAN_DIR)
     include("${QT_CONAN_DIR}/conanbuildinfo.cmake")
 
     # Remove this workaround when libxslt package is fixed
-    string(REPLACE "include/libxslt" "include" replace_CONAN_INCLUDE_DIRS ${CONAN_INCLUDE_DIRS})
+    string(REPLACE "include/libxslt" "include" replace_CONAN_INCLUDE_DIRS "${CONAN_INCLUDE_DIRS}")
     set(CONAN_INCLUDE_DIRS ${replace_CONAN_INCLUDE_DIRS})
 
     # Remove this workaround when libxml2 package is fixed
@@ -29,6 +29,15 @@ if (QT_CONAN_DIR)
     set(CMAKE_MODULE_PATH ${_BACKUP_CMAKE_MODULE_PATH})
     unset(_BACKUP_CMAKE_MODULE_PATH)
 
+    # Because we've reset CMAKE_MODULE_PATH, FindZLIB from Conan is not used, which causes error with MinGW
+    if (NOT QT_BUNDLED_ZLIB)
+        if (NOT CONAN_ZLIB_ROOT)
+            message(FATAL_ERROR "CONAN_ZLIB_ROOT is not set")
+        endif ()
+        set(ZLIB_ROOT ${CONAN_ZLIB_ROOT})
+        message(STATUS "ZLIB_ROOT: ${ZLIB_ROOT}")
+    endif ()
+
     install(CODE "
         set(_conan_imports_dest \${CMAKE_INSTALL_PREFIX})
         if (DEFINED ENV{DESTDIR})
@@ -147,6 +156,24 @@ macro(QTWEBKIT_GENERATE_MOC_FILES_H _target)
     endforeach ()
 endmacro()
 
+macro(QTWEBKIT_SEPARATE_DEBUG_INFO _target _target_debug)
+    if (UNIX AND NOT APPLE)
+        if (NOT CMAKE_OBJCOPY)
+            message(WARNING "CMAKE_OBJCOPY is not defined - debug information will not be split")
+        else ()
+            set(_target_file "$<TARGET_FILE:${_target}>")
+            set(${_target_debug} "${_target_file}.debug")
+            add_custom_command(TARGET ${_target} POST_BUILD
+                COMMAND ${CMAKE_OBJCOPY} --only-keep-debug ${_target_file} ${${_target_debug}}
+                COMMAND ${CMAKE_OBJCOPY} --strip-debug ${_target_file}
+                COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=${${_target_debug}} ${_target_file}
+                VERBATIM
+            )
+            unset(_target_file)
+        endif ()
+    endif ()
+endmacro()
+
 set(CMAKE_MACOSX_RPATH ON)
 
 add_definitions(-DBUILDING_QT__=1)
@@ -698,6 +725,19 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-keep-inline-dllexport")
 endif ()
 
+# See also FORCE_DEBUG_INFO in Source/PlatformQt.cmake
+if (FORCE_DEBUG_INFO)
+    if (COMPILER_IS_GCC_OR_CLANG)
+        # Enable debug info in Release builds
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g")
+    endif ()
+    if (USE_LD_GOLD)
+       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
+       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
+    endif ()
+endif ()
+
 if (APPLE)
     SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1)
 endif ()
diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index d58c73eb4..8d57af7af 100644
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -288,10 +288,10 @@ macro(WEBKIT_FRAMEWORK _target)
     if (APPLE AND NOT PORT STREQUAL "GTK" AND NOT ${${_target}_LIBRARY_TYPE} MATCHES STATIC)
         set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
         if (${_target}_PUBLIC_HEADERS)
-            set_target_properties(${_target} PROPERTIES PUBLIC_HEADER "${${_target}_PUBLIC_HEADERS}}")
+            set_target_properties(${_target} PROPERTIES PUBLIC_HEADER "${${_target}_PUBLIC_HEADERS}")
             if (${_target}_PRIVATE_HEADERS)
                 foreach (CURRENT_PRIVATE_HEADER ${${_target}_PRIVATE_HEADERS})
-                    set_property(SOURCE ${CURRENT_PRIVATE_HEADER} PROPERTY MACOSX_PACKAGE_LOCATION ${${_target}_PRIVATE_HEADERS_LOCATION} )
+                    set_property(SOURCE ${CURRENT_PRIVATE_HEADER} PROPERTY MACOSX_PACKAGE_LOCATION ${${_target}_PRIVATE_HEADERS_LOCATION})
                 endforeach ()
             endif ()
         endif ()
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro
index 5cdd40a77..71872664b 100644
--- a/Tools/qmake/projects/run_cmake.pro
+++ b/Tools/qmake/projects/run_cmake.pro
@@ -63,6 +63,11 @@ build_pass|!debug_and_release {
         CMAKE_CONFIG += USE_MINIMAL_DEBUG_INFO_MSVC=ON
     }
 
+    !macos {
+        force_debug_info: CMAKE_CONFIG += FORCE_DEBUG_INFO=ON
+        qtConfig(separate_debug_info): CMAKE_CONFIG += SEPARATE_DEBUG_INFO=ON
+    }
+
     macos {
         # Reuse the cached sdk version value from mac/sdk.prf if available
         # otherwise query for it.
@@ -81,6 +86,8 @@ build_pass|!debug_and_release {
         !qt_framework: CMAKE_CONFIG += MACOS_BUILD_FRAMEWORKS=OFF
     }
 
+    linux:isEqual(EXTRA_RPATHS, "."): CMAKE_CONFIG += QT_ORIGIN_RPATH=ON
+
     !isEmpty(use_ninja): cmake_args += "-G Ninja"
 
     equals(QMAKE_HOST.os, Windows) {
diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt
index 39414cc5f..364b7d464 100644
--- a/Tools/qt/manifest.txt
+++ b/Tools/qt/manifest.txt
@@ -157,3 +157,5 @@ file Tools/Scripts/webkitperl/FeatureList.pm
 file Tools/jhbuild/jhbuildutils.py
 file WebKit.pro
 file .qmake.conf
+
+directory tests
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 000000000..306095ae0
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(webkitwidgets)
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 000000000..483a6691b
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += webkitwidgets
diff --git a/Source/WebKit/qt/tests/CMakeLists.txt b/tests/webkitwidgets/CMakeLists.txt
index 42d636573..42d636573 100644
--- a/Source/WebKit/qt/tests/CMakeLists.txt
+++ b/tests/webkitwidgets/CMakeLists.txt
diff --git a/Source/WebKit/qt/tests/MIMESniffing/TestData.h b/tests/webkitwidgets/MIMESniffing/TestData.h
index c04bd6b89..c04bd6b89 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/TestData.h
+++ b/tests/webkitwidgets/MIMESniffing/TestData.h
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources.qrc b/tests/webkitwidgets/MIMESniffing/resources.qrc
index b4afb321e..b4afb321e 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources.qrc
+++ b/tests/webkitwidgets/MIMESniffing/resources.qrc
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_atom+xml b/tests/webkitwidgets/MIMESniffing/resources/application_atom+xml
index 54086a7be..54086a7be 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_atom+xml
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_atom+xml
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_ogg b/tests/webkitwidgets/MIMESniffing/resources/application_ogg
index b9cc1b291..b9cc1b291 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_ogg
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_ogg
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_pdf b/tests/webkitwidgets/MIMESniffing/resources/application_pdf
index 7f8996f6a..7f8996f6a 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_pdf
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_pdf
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_postscript b/tests/webkitwidgets/MIMESniffing/resources/application_postscript
index c4b9ae6cb..c4b9ae6cb 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_postscript
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_postscript
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_rdf+xml b/tests/webkitwidgets/MIMESniffing/resources/application_rdf+xml
index e21414543..e21414543 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_rdf+xml
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_rdf+xml
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_rss+xml b/tests/webkitwidgets/MIMESniffing/resources/application_rss+xml
index 3537c41c5..3537c41c5 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_rss+xml
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_rss+xml
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_x-gzip b/tests/webkitwidgets/MIMESniffing/resources/application_x-gzip
index a5e7d3131..a5e7d3131 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_x-gzip
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_x-gzip
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_x-rar-compressed b/tests/webkitwidgets/MIMESniffing/resources/application_x-rar-compressed
index d9cb6ae25..d9cb6ae25 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_x-rar-compressed
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_x-rar-compressed
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/application_zip b/tests/webkitwidgets/MIMESniffing/resources/application_zip
index 8aec52fb2..8aec52fb2 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/application_zip
+++ b/tests/webkitwidgets/MIMESniffing/resources/application_zip
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/audio_x-wave b/tests/webkitwidgets/MIMESniffing/resources/audio_x-wave
index a0f9b85ff..a0f9b85ff 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/audio_x-wave
+++ b/tests/webkitwidgets/MIMESniffing/resources/audio_x-wave
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/image_bmp b/tests/webkitwidgets/MIMESniffing/resources/image_bmp
index b61d3688f..b61d3688f 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/image_bmp
+++ b/tests/webkitwidgets/MIMESniffing/resources/image_bmp
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/image_gif b/tests/webkitwidgets/MIMESniffing/resources/image_gif
index 32b1ea23f..32b1ea23f 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/image_gif
+++ b/tests/webkitwidgets/MIMESniffing/resources/image_gif
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/image_jpeg b/tests/webkitwidgets/MIMESniffing/resources/image_jpeg
index 187457663..187457663 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/image_jpeg
+++ b/tests/webkitwidgets/MIMESniffing/resources/image_jpeg
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/image_png b/tests/webkitwidgets/MIMESniffing/resources/image_png
index bef59c785..bef59c785 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/image_png
+++ b/tests/webkitwidgets/MIMESniffing/resources/image_png
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/image_vnd.microsoft.icon b/tests/webkitwidgets/MIMESniffing/resources/image_vnd.microsoft.icon
index 58921b8bb..58921b8bb 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/image_vnd.microsoft.icon
+++ b/tests/webkitwidgets/MIMESniffing/resources/image_vnd.microsoft.icon
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/image_webp b/tests/webkitwidgets/MIMESniffing/resources/image_webp
index 0da983e2c..0da983e2c 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/image_webp
+++ b/tests/webkitwidgets/MIMESniffing/resources/image_webp
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/text_html b/tests/webkitwidgets/MIMESniffing/resources/text_html
index 21eeee345..21eeee345 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/text_html
+++ b/tests/webkitwidgets/MIMESniffing/resources/text_html
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/text_xml b/tests/webkitwidgets/MIMESniffing/resources/text_xml
index 38a9fe548..38a9fe548 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/text_xml
+++ b/tests/webkitwidgets/MIMESniffing/resources/text_xml
diff --git a/Source/WebKit/qt/tests/MIMESniffing/resources/video_webm b/tests/webkitwidgets/MIMESniffing/resources/video_webm
index 95d5031a8..95d5031a8 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/resources/video_webm
+++ b/tests/webkitwidgets/MIMESniffing/resources/video_webm
diff --git a/Source/WebKit/qt/tests/MIMESniffing/tst_MIMESniffing.cpp b/tests/webkitwidgets/MIMESniffing/tst_MIMESniffing.cpp
index 8c5417f26..8c5417f26 100644
--- a/Source/WebKit/qt/tests/MIMESniffing/tst_MIMESniffing.cpp
+++ b/tests/webkitwidgets/MIMESniffing/tst_MIMESniffing.cpp
diff --git a/tests/webkitwidgets/benchmarks/loading/loading.pro b/tests/webkitwidgets/benchmarks/loading/loading.pro
new file mode 100644
index 000000000..2677a2200
--- /dev/null
+++ b/tests/webkitwidgets/benchmarks/loading/loading.pro
@@ -0,0 +1,2 @@
+include(../../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp b/tests/webkitwidgets/benchmarks/loading/tst_loading.cpp
index 2ebf3775d..c67f422c0 100644
--- a/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp
+++ b/tests/webkitwidgets/benchmarks/loading/tst_loading.cpp
@@ -80,7 +80,7 @@ void tst_Loading::load()
 
 #ifndef QT_NO_BEARERMANAGEMENT
     if (!m_manager.isOnline())
-        W_QSKIP("This test requires an active network connection", SkipSingle);
+        QSKIP("This test requires an active network connection", SkipSingle);
 #endif
 
     QBENCHMARK {
diff --git a/tests/webkitwidgets/benchmarks/painting/painting.pro b/tests/webkitwidgets/benchmarks/painting/painting.pro
new file mode 100644
index 000000000..2677a2200
--- /dev/null
+++ b/tests/webkitwidgets/benchmarks/painting/painting.pro
@@ -0,0 +1,2 @@
+include(../../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp b/tests/webkitwidgets/benchmarks/painting/tst_painting.cpp
index 8abba4bad..f1456f9e3 100644
--- a/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp
+++ b/tests/webkitwidgets/benchmarks/painting/tst_painting.cpp
@@ -80,7 +80,7 @@ void tst_Painting::paint()
 
 #ifndef QT_NO_BEARERMANAGEMENT
     if (!m_manager.isOnline())
-        W_QSKIP("This test requires an active network connection", SkipSingle);
+        QSKIP("This test requires an active network connection", SkipSingle);
 #endif
 
     m_view->load(url);
diff --git a/Source/WebKit/qt/tests/benchmarks/webgl/10000_triangles.html b/tests/webkitwidgets/benchmarks/webgl/10000_triangles.html
index fd061aa27..fd061aa27 100644
--- a/Source/WebKit/qt/tests/benchmarks/webgl/10000_triangles.html
+++ b/tests/webkitwidgets/benchmarks/webgl/10000_triangles.html
diff --git a/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl.cpp b/tests/webkitwidgets/benchmarks/webgl/tst_webgl.cpp
index 14ff1a80f..14ff1a80f 100644
--- a/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl.cpp
+++ b/tests/webkitwidgets/benchmarks/webgl/tst_webgl.cpp
diff --git a/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl.qrc b/tests/webkitwidgets/benchmarks/webgl/tst_webgl.qrc
index b849448d7..b849448d7 100644
--- a/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl.qrc
+++ b/tests/webkitwidgets/benchmarks/webgl/tst_webgl.qrc
diff --git a/tests/webkitwidgets/benchmarks/webgl/webgl.pro b/tests/webkitwidgets/benchmarks/webgl/webgl.pro
new file mode 100644
index 000000000..a471269bd
--- /dev/null
+++ b/tests/webkitwidgets/benchmarks/webgl/webgl.pro
@@ -0,0 +1,3 @@
+include(../../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+QT += opengl
diff --git a/tests/webkitwidgets/cmake/cmake.pro b/tests/webkitwidgets/cmake/cmake.pro
new file mode 100644
index 000000000..bf2dbcb77
--- /dev/null
+++ b/tests/webkitwidgets/cmake/cmake.pro
@@ -0,0 +1,5 @@
+
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CONFIG += ctest_testcase
diff --git a/tests/webkitwidgets/hybridPixmap/hybridPixmap.pro b/tests/webkitwidgets/hybridPixmap/hybridPixmap.pro
new file mode 100644
index 000000000..68e565941
--- /dev/null
+++ b/tests/webkitwidgets/hybridPixmap/hybridPixmap.pro
@@ -0,0 +1,10 @@
+# -------------------------------------------------
+# Project created by QtCreator 2009-12-10T11:25:02
+# -------------------------------------------------
+include(../tests.pri)
+TARGET = hybridPixmap
+SOURCES += widget.cpp
+HEADERS += widget.h
+FORMS += widget.ui
+RESOURCES += tst_hybridPixmap.qrc
+CONFIG += console
diff --git a/Source/WebKit/qt/tests/hybridPixmap/test.html b/tests/webkitwidgets/hybridPixmap/test.html
index a6cbed1fb..a6cbed1fb 100644
--- a/Source/WebKit/qt/tests/hybridPixmap/test.html
+++ b/tests/webkitwidgets/hybridPixmap/test.html
diff --git a/Source/WebKit/qt/tests/hybridPixmap/tst_hybridPixmap.cpp b/tests/webkitwidgets/hybridPixmap/tst_hybridPixmap.cpp
index 84891580a..84891580a 100644
--- a/Source/WebKit/qt/tests/hybridPixmap/tst_hybridPixmap.cpp
+++ b/tests/webkitwidgets/hybridPixmap/tst_hybridPixmap.cpp
diff --git a/Source/WebKit/qt/tests/hybridPixmap/tst_hybridPixmap.qrc b/tests/webkitwidgets/hybridPixmap/tst_hybridPixmap.qrc
index 5fd47e32d..5fd47e32d 100644
--- a/Source/WebKit/qt/tests/hybridPixmap/tst_hybridPixmap.qrc
+++ b/tests/webkitwidgets/hybridPixmap/tst_hybridPixmap.qrc
diff --git a/Source/WebKit/qt/tests/hybridPixmap/widget.cpp b/tests/webkitwidgets/hybridPixmap/widget.cpp
index 6c4d2cd49..6c4d2cd49 100644
--- a/Source/WebKit/qt/tests/hybridPixmap/widget.cpp
+++ b/tests/webkitwidgets/hybridPixmap/widget.cpp
diff --git a/Source/WebKit/qt/tests/hybridPixmap/widget.h b/tests/webkitwidgets/hybridPixmap/widget.h
index b78df8b5e..b78df8b5e 100644
--- a/Source/WebKit/qt/tests/hybridPixmap/widget.h
+++ b/tests/webkitwidgets/hybridPixmap/widget.h
diff --git a/Source/WebKit/qt/tests/hybridPixmap/widget.ui b/tests/webkitwidgets/hybridPixmap/widget.ui
index 272d6a71f..272d6a71f 100644
--- a/Source/WebKit/qt/tests/hybridPixmap/widget.ui
+++ b/tests/webkitwidgets/hybridPixmap/widget.ui
diff --git a/Source/WebKit/qt/tests/keyeddecoderqt/tst_keyeddecoderqt.cpp b/tests/webkitwidgets/keyeddecoderqt/tst_keyeddecoderqt.cpp
index 515328028..515328028 100644
--- a/Source/WebKit/qt/tests/keyeddecoderqt/tst_keyeddecoderqt.cpp
+++ b/tests/webkitwidgets/keyeddecoderqt/tst_keyeddecoderqt.cpp
diff --git a/Source/WebKit/qt/tests/keyedencoderqt/tst_keyedencoderqt.cpp b/tests/webkitwidgets/keyedencoderqt/tst_keyedencoderqt.cpp
index a61c02059..a61c02059 100644
--- a/Source/WebKit/qt/tests/keyedencoderqt/tst_keyedencoderqt.cpp
+++ b/tests/webkitwidgets/keyedencoderqt/tst_keyedencoderqt.cpp
diff --git a/tests/webkitwidgets/qgraphicswebview/qgraphicswebview.pro b/tests/webkitwidgets/qgraphicswebview/qgraphicswebview.pro
new file mode 100644
index 000000000..78e17a06d
--- /dev/null
+++ b/tests/webkitwidgets/qgraphicswebview/qgraphicswebview.pro
@@ -0,0 +1,6 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+
+enable?(WEBGL) {
+    QT += opengl
+}
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/resources/greendiv.html b/tests/webkitwidgets/qgraphicswebview/resources/greendiv.html
index 2f7fa97ca..2f7fa97ca 100644
--- a/Source/WebKit/qt/tests/qgraphicswebview/resources/greendiv.html
+++ b/tests/webkitwidgets/qgraphicswebview/resources/greendiv.html
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/resources/input_types.html b/tests/webkitwidgets/qgraphicswebview/resources/input_types.html
index 18ab314bf..18ab314bf 100644
--- a/Source/WebKit/qt/tests/qgraphicswebview/resources/input_types.html
+++ b/tests/webkitwidgets/qgraphicswebview/resources/input_types.html
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/resources/pointing_right.html b/tests/webkitwidgets/qgraphicswebview/resources/pointing_right.html
index bc592fbde..bc592fbde 100644
--- a/Source/WebKit/qt/tests/qgraphicswebview/resources/pointing_right.html
+++ b/tests/webkitwidgets/qgraphicswebview/resources/pointing_right.html
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/resources/pointing_up.html b/tests/webkitwidgets/qgraphicswebview/resources/pointing_up.html
index 474a56d3f..474a56d3f 100644
--- a/Source/WebKit/qt/tests/qgraphicswebview/resources/pointing_up.html
+++ b/tests/webkitwidgets/qgraphicswebview/resources/pointing_up.html
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/resources/scrolltest_page.html b/tests/webkitwidgets/qgraphicswebview/resources/scrolltest_page.html
index 18fcbbebe..18fcbbebe 100644
--- a/Source/WebKit/qt/tests/qgraphicswebview/resources/scrolltest_page.html
+++ b/tests/webkitwidgets/qgraphicswebview/resources/scrolltest_page.html
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp b/tests/webkitwidgets/qgraphicswebview/tst_qgraphicswebview.cpp
index 8417d0ef7..0e8577d8c 100644
--- a/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
+++ b/tests/webkitwidgets/qgraphicswebview/tst_qgraphicswebview.cpp
@@ -167,6 +167,8 @@ void tst_QGraphicsWebView::crashOnSetScaleBeforeSetUrl()
 
 void tst_QGraphicsWebView::widgetsRenderingThroughCache()
 {
+    QSKIP("TiledBackingStore does not work -- https://github.com/qtwebkit/qtwebkit/issues/407");
+
     // Widgets should be rendered the same way with and without
     // intermediate cache (tiling for example).
     // See bug https://bugs.webkit.org/show_bug.cgi?id=47767 where
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.qrc b/tests/webkitwidgets/qgraphicswebview/tst_qgraphicswebview.qrc
index ff06bd8c4..ff06bd8c4 100644
--- a/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.qrc
+++ b/tests/webkitwidgets/qgraphicswebview/tst_qgraphicswebview.qrc
diff --git a/tests/webkitwidgets/qobjectbridge/qobjectbridge.pro b/tests/webkitwidgets/qobjectbridge/qobjectbridge.pro
new file mode 100644
index 000000000..f434ccbc1
--- /dev/null
+++ b/tests/webkitwidgets/qobjectbridge/qobjectbridge.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+
diff --git a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp b/tests/webkitwidgets/qobjectbridge/tst_qobjectbridge.cpp
index a46d39050..a46d39050 100644
--- a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
+++ b/tests/webkitwidgets/qobjectbridge/tst_qobjectbridge.cpp
diff --git a/tests/webkitwidgets/qwebelement/qwebelement.pro b/tests/webkitwidgets/qwebelement/qwebelement.pro
new file mode 100644
index 000000000..ff6c49628
--- /dev/null
+++ b/tests/webkitwidgets/qwebelement/qwebelement.pro
@@ -0,0 +1,2 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/qwebelement/resources/image.png b/tests/webkitwidgets/qwebelement/resources/image.png
index 8d703640c..8d703640c 100644
--- a/Source/WebKit/qt/tests/qwebelement/resources/image.png
+++ b/tests/webkitwidgets/qwebelement/resources/image.png
diff --git a/Source/WebKit/qt/tests/qwebelement/resources/style.css b/tests/webkitwidgets/qwebelement/resources/style.css
index 2713dfda9..2713dfda9 100644
--- a/Source/WebKit/qt/tests/qwebelement/resources/style.css
+++ b/tests/webkitwidgets/qwebelement/resources/style.css
diff --git a/Source/WebKit/qt/tests/qwebelement/resources/style2.css b/tests/webkitwidgets/qwebelement/resources/style2.css
index 6575dcb04..6575dcb04 100644
--- a/Source/WebKit/qt/tests/qwebelement/resources/style2.css
+++ b/tests/webkitwidgets/qwebelement/resources/style2.css
diff --git a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/tests/webkitwidgets/qwebelement/tst_qwebelement.cpp
index 4ca5fe5f9..4ca5fe5f9 100644
--- a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/tests/webkitwidgets/qwebelement/tst_qwebelement.cpp
diff --git a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.qrc b/tests/webkitwidgets/qwebelement/tst_qwebelement.qrc
index 7384c76e0..7384c76e0 100644
--- a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.qrc
+++ b/tests/webkitwidgets/qwebelement/tst_qwebelement.qrc
diff --git a/tests/webkitwidgets/qwebframe/qwebframe.pro b/tests/webkitwidgets/qwebframe/qwebframe.pro
new file mode 100644
index 000000000..f434ccbc1
--- /dev/null
+++ b/tests/webkitwidgets/qwebframe/qwebframe.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+
diff --git a/Source/WebKit/qt/tests/qwebframe/resources/image.png b/tests/webkitwidgets/qwebframe/resources/image.png
index 8d703640c..8d703640c 100644
--- a/Source/WebKit/qt/tests/qwebframe/resources/image.png
+++ b/tests/webkitwidgets/qwebframe/resources/image.png
diff --git a/Source/WebKit/qt/tests/qwebframe/resources/style.css b/tests/webkitwidgets/qwebframe/resources/style.css
index c05b747f1..c05b747f1 100644
--- a/Source/WebKit/qt/tests/qwebframe/resources/style.css
+++ b/tests/webkitwidgets/qwebframe/resources/style.css
diff --git a/Source/WebKit/qt/tests/qwebframe/resources/test1.html b/tests/webkitwidgets/qwebframe/resources/test1.html
index b323f966e..b323f966e 100644
--- a/Source/WebKit/qt/tests/qwebframe/resources/test1.html
+++ b/tests/webkitwidgets/qwebframe/resources/test1.html
diff --git a/Source/WebKit/qt/tests/qwebframe/resources/test2.html b/tests/webkitwidgets/qwebframe/resources/test2.html
index 63ac1f6ec..63ac1f6ec 100644
--- a/Source/WebKit/qt/tests/qwebframe/resources/test2.html
+++ b/tests/webkitwidgets/qwebframe/resources/test2.html
diff --git a/Source/WebKit/qt/tests/qwebframe/resources/testiframe.html b/tests/webkitwidgets/qwebframe/resources/testiframe.html
index ee0f64d1b..ee0f64d1b 100644
--- a/Source/WebKit/qt/tests/qwebframe/resources/testiframe.html
+++ b/tests/webkitwidgets/qwebframe/resources/testiframe.html
diff --git a/Source/WebKit/qt/tests/qwebframe/resources/testiframe2.html b/tests/webkitwidgets/qwebframe/resources/testiframe2.html
index 483e94e1d..483e94e1d 100644
--- a/Source/WebKit/qt/tests/qwebframe/resources/testiframe2.html
+++ b/tests/webkitwidgets/qwebframe/resources/testiframe2.html
diff --git a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/tests/webkitwidgets/qwebframe/tst_qwebframe.cpp
index 2068eec3f..d635f8e2c 100644
--- a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/tests/webkitwidgets/qwebframe/tst_qwebframe.cpp
@@ -469,7 +469,7 @@ void tst_QWebFrame::setHtmlWithBaseURL()
     // As we are using a local file as baseUrl, its security origin should be able to load local resources.
 
     if (!QDir(TESTS_SOURCE_DIR).exists())
-        W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
+        QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
 
     QDir::setCurrent(TESTS_SOURCE_DIR);
 
@@ -702,7 +702,9 @@ void tst_QWebFrame::baseUrl()
     QFETCH(QUrl, baseUrl);
 
     m_page->mainFrame()->setHtml(html, loadUrl);
+    QEXPECT_FAIL("null", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
     QCOMPARE(m_page->mainFrame()->url(), url);
+    QEXPECT_FAIL("null", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
     QCOMPARE(m_page->mainFrame()->baseUrl(), baseUrl);
 }
 
diff --git a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.qrc b/tests/webkitwidgets/qwebframe/tst_qwebframe.qrc
index 2a7d0b9c2..2a7d0b9c2 100644
--- a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.qrc
+++ b/tests/webkitwidgets/qwebframe/tst_qwebframe.qrc
diff --git a/tests/webkitwidgets/qwebhistory/qwebhistory.pro b/tests/webkitwidgets/qwebhistory/qwebhistory.pro
new file mode 100644
index 000000000..ff6c49628
--- /dev/null
+++ b/tests/webkitwidgets/qwebhistory/qwebhistory.pro
@@ -0,0 +1,2 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/qwebhistory/resources/page1.html b/tests/webkitwidgets/qwebhistory/resources/page1.html
index 82fa4aff1..82fa4aff1 100644
--- a/Source/WebKit/qt/tests/qwebhistory/resources/page1.html
+++ b/tests/webkitwidgets/qwebhistory/resources/page1.html
diff --git a/Source/WebKit/qt/tests/qwebhistory/resources/page2.html b/tests/webkitwidgets/qwebhistory/resources/page2.html
index 5307bdcfd..5307bdcfd 100644
--- a/Source/WebKit/qt/tests/qwebhistory/resources/page2.html
+++ b/tests/webkitwidgets/qwebhistory/resources/page2.html
diff --git a/Source/WebKit/qt/tests/qwebhistory/resources/page3.html b/tests/webkitwidgets/qwebhistory/resources/page3.html
index 4e5547c7e..4e5547c7e 100644
--- a/Source/WebKit/qt/tests/qwebhistory/resources/page3.html
+++ b/tests/webkitwidgets/qwebhistory/resources/page3.html
diff --git a/Source/WebKit/qt/tests/qwebhistory/resources/page4.html b/tests/webkitwidgets/qwebhistory/resources/page4.html
index 3c57aeddc..3c57aeddc 100644
--- a/Source/WebKit/qt/tests/qwebhistory/resources/page4.html
+++ b/tests/webkitwidgets/qwebhistory/resources/page4.html
diff --git a/Source/WebKit/qt/tests/qwebhistory/resources/page5.html b/tests/webkitwidgets/qwebhistory/resources/page5.html
index 859355279..859355279 100644
--- a/Source/WebKit/qt/tests/qwebhistory/resources/page5.html
+++ b/tests/webkitwidgets/qwebhistory/resources/page5.html
diff --git a/Source/WebKit/qt/tests/qwebhistory/resources/page6.html b/tests/webkitwidgets/qwebhistory/resources/page6.html
index c5bbc6f79..c5bbc6f79 100644
--- a/Source/WebKit/qt/tests/qwebhistory/resources/page6.html
+++ b/tests/webkitwidgets/qwebhistory/resources/page6.html
diff --git a/Source/WebKit/qt/tests/qwebhistory/tst_qwebhistory.cpp b/tests/webkitwidgets/qwebhistory/tst_qwebhistory.cpp
index 8df3d26d6..8df3d26d6 100644
--- a/Source/WebKit/qt/tests/qwebhistory/tst_qwebhistory.cpp
+++ b/tests/webkitwidgets/qwebhistory/tst_qwebhistory.cpp
diff --git a/Source/WebKit/qt/tests/qwebhistory/tst_qwebhistory.qrc b/tests/webkitwidgets/qwebhistory/tst_qwebhistory.qrc
index 6e2f50a95..6e2f50a95 100644
--- a/Source/WebKit/qt/tests/qwebhistory/tst_qwebhistory.qrc
+++ b/tests/webkitwidgets/qwebhistory/tst_qwebhistory.qrc
diff --git a/tests/webkitwidgets/qwebhistoryinterface/qwebhistoryinterface.pro b/tests/webkitwidgets/qwebhistoryinterface/qwebhistoryinterface.pro
new file mode 100644
index 000000000..ff6c49628
--- /dev/null
+++ b/tests/webkitwidgets/qwebhistoryinterface/qwebhistoryinterface.pro
@@ -0,0 +1,2 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/qwebhistoryinterface/tst_qwebhistoryinterface.cpp b/tests/webkitwidgets/qwebhistoryinterface/tst_qwebhistoryinterface.cpp
index 91d1c997f..91d1c997f 100644
--- a/Source/WebKit/qt/tests/qwebhistoryinterface/tst_qwebhistoryinterface.cpp
+++ b/tests/webkitwidgets/qwebhistoryinterface/tst_qwebhistoryinterface.cpp
diff --git a/tests/webkitwidgets/qwebinspector/qwebinspector.pro b/tests/webkitwidgets/qwebinspector/qwebinspector.pro
new file mode 100644
index 000000000..ff6c49628
--- /dev/null
+++ b/tests/webkitwidgets/qwebinspector/qwebinspector.pro
@@ -0,0 +1,2 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp b/tests/webkitwidgets/qwebinspector/tst_qwebinspector.cpp
index 37e62f67b..37e62f67b 100644
--- a/Source/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp
+++ b/tests/webkitwidgets/qwebinspector/tst_qwebinspector.cpp
diff --git a/tests/webkitwidgets/qwebpage/qwebpage.pro b/tests/webkitwidgets/qwebpage/qwebpage.pro
new file mode 100644
index 000000000..e56bbe8f7
--- /dev/null
+++ b/tests/webkitwidgets/qwebpage/qwebpage.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+QT *= core-private gui-private
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/content.html b/tests/webkitwidgets/qwebpage/resources/content.html
index 823a98306..823a98306 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/content.html
+++ b/tests/webkitwidgets/qwebpage/resources/content.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/frame_a.html b/tests/webkitwidgets/qwebpage/resources/frame_a.html
index 9ff68f13a..9ff68f13a 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/frame_a.html
+++ b/tests/webkitwidgets/qwebpage/resources/frame_a.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/frame_c.html b/tests/webkitwidgets/qwebpage/resources/frame_c.html
index eba9ca0eb..eba9ca0eb 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/frame_c.html
+++ b/tests/webkitwidgets/qwebpage/resources/frame_c.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/framedindex.html b/tests/webkitwidgets/qwebpage/resources/framedindex.html
index be4500483..be4500483 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/framedindex.html
+++ b/tests/webkitwidgets/qwebpage/resources/framedindex.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/iframe.html b/tests/webkitwidgets/qwebpage/resources/iframe.html
index f17027c7a..f17027c7a 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/iframe.html
+++ b/tests/webkitwidgets/qwebpage/resources/iframe.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/iframe2.html b/tests/webkitwidgets/qwebpage/resources/iframe2.html
index 501743597..501743597 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/iframe2.html
+++ b/tests/webkitwidgets/qwebpage/resources/iframe2.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/iframe3.html b/tests/webkitwidgets/qwebpage/resources/iframe3.html
index ed6ac5b94..ed6ac5b94 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/iframe3.html
+++ b/tests/webkitwidgets/qwebpage/resources/iframe3.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/index.html b/tests/webkitwidgets/qwebpage/resources/index.html
index 638df364e..638df364e 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/index.html
+++ b/tests/webkitwidgets/qwebpage/resources/index.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/script.html b/tests/webkitwidgets/qwebpage/resources/script.html
index ede986415..ede986415 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/script.html
+++ b/tests/webkitwidgets/qwebpage/resources/script.html
diff --git a/Source/WebKit/qt/tests/qwebpage/resources/user.css b/tests/webkitwidgets/qwebpage/resources/user.css
index 4ccb2f0fc..4ccb2f0fc 100644
--- a/Source/WebKit/qt/tests/qwebpage/resources/user.css
+++ b/tests/webkitwidgets/qwebpage/resources/user.css
diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/tests/webkitwidgets/qwebpage/tst_qwebpage.cpp
index db4c911e6..eb50384e7 100644
--- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/tests/webkitwidgets/qwebpage/tst_qwebpage.cpp
@@ -400,7 +400,7 @@ void tst_QWebPage::geolocationRequestJS()
 
     if (newPage->mainFrame()->evaluateJavaScript(QLatin1String("!navigator.geolocation")).toBool()) {
         delete newPage;
-        W_QSKIP("Geolocation is not supported.", SkipSingle);
+        QSKIP("Geolocation is not supported.", SkipSingle);
     }
 
     connect(newPage, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)),
@@ -641,7 +641,7 @@ void tst_QWebPage::loadHtml5Video()
     QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65452", Continue);
     QCOMPARE(mUrl.toEncoded(), url);
 #else
-    W_QSKIP("This test requires Qt Multimedia", SkipAll);
+    QSKIP("This test requires Qt Multimedia", SkipAll);
 #endif
 }
 
@@ -1134,6 +1134,7 @@ void tst_QWebPage::multiplePageGroupsAndLocalStorage()
     view2.setHtml(QString("<html><body> </body></html>"), QUrl("http://www.myexample.com/"));
 
     QVariant s1 = view1.page()->mainFrame()->evaluateJavaScript("localStorage.test");
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
     QCOMPARE(s1.toString(), QString("value1"));
 
     QVariant s2 = view2.page()->mainFrame()->evaluateJavaScript("localStorage.test");
@@ -1654,6 +1655,7 @@ void tst_QWebPage::backActionUpdate()
     QUrl url = QUrl("qrc:///resources/framedindex.html");
     page->mainFrame()->load(url);
     QTRY_COMPARE(loadSpy.count(), 1);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
     QVERIFY(!action->isEnabled());
     QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(10, 10));
     QTRY_COMPARE(loadSpy.count(), 2);
@@ -2837,7 +2839,7 @@ void tst_QWebPage::screenshot_data()
 void tst_QWebPage::screenshot()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
-        W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
+        QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
 
     QDir::setCurrent(TESTS_SOURCE_DIR);
 
@@ -3196,18 +3198,24 @@ void tst_QWebPage::changeVisibilityState()
     stateBool = m_page->mainFrame()->evaluateJavaScript("stateBool");
     QVERIFY(stateBool.type() == QVariant::Bool && stateBool.toBool());
     stateString = m_page->mainFrame()->evaluateJavaScript("stateString");
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
     QVERIFY(stateString.type() == QVariant::String && stateString.toString() == QString("prerender"));
     cpt = m_page->mainFrame()->evaluateJavaScript("cpt");
     QVERIFY(cpt.type() == QVariant::Double && cpt.toDouble() == 1);
 
     m_page->setVisibilityState(QWebPage::VisibilityStateUnloaded);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
     QCOMPARE(m_page->visibilityState(), QWebPage::VisibilityStateUnloaded);
     stateBool = m_page->mainFrame()->evaluateJavaScript("stateBool");
     QVERIFY(stateBool.type() == QVariant::Bool && stateBool.toBool());
     stateString = m_page->mainFrame()->evaluateJavaScript("stateString");
-    QVERIFY(stateString.type() == QVariant::String && stateString.toString() == QString("unloaded"));
+    QCOMPARE(stateString.type(), QVariant::String);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
+    QCOMPARE(stateString.toString(), QString("unloaded"));
     cpt = m_page->mainFrame()->evaluateJavaScript("cpt");
-    QVERIFY(cpt.type() == QVariant::Double && cpt.toDouble() == 2);
+    QCOMPARE(cpt.type(), QVariant::Double);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
+    QCOMPARE(cpt.toDouble(), 2.0);
 
     m_page->setVisibilityState(QWebPage::VisibilityStateVisible);
     QCOMPARE(m_page->visibilityState(), QWebPage::VisibilityStateVisible);
@@ -3216,7 +3224,9 @@ void tst_QWebPage::changeVisibilityState()
     stateString = m_page->mainFrame()->evaluateJavaScript("stateString");
     QVERIFY(stateString.type() == QVariant::String && stateString.toString() == QString("visible"));
     cpt = m_page->mainFrame()->evaluateJavaScript("cpt");
-    QVERIFY(cpt.type() == QVariant::Double && cpt.toDouble() == 3);
+    QCOMPARE(cpt.type(), QVariant::Double);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
+    QCOMPARE(cpt.toDouble(), 3.0);
 
     m_page->setVisibilityState(QWebPage::VisibilityStateHidden);
     QCOMPARE(m_page->visibilityState(), QWebPage::VisibilityStateHidden);
@@ -3225,7 +3235,9 @@ void tst_QWebPage::changeVisibilityState()
     stateString = m_page->mainFrame()->evaluateJavaScript("stateString");
     QVERIFY(stateString.type() == QVariant::String && stateString.toString() == QString("hidden"));
     cpt = m_page->mainFrame()->evaluateJavaScript("cpt");
-    QVERIFY(cpt.type() == QVariant::Double && cpt.toDouble() == 4);
+    QCOMPARE(cpt.type(), QVariant::Double);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
+    QCOMPARE(cpt.toDouble(), 4.0);
 
     m_page->setVisibilityState(QWebPage::VisibilityStateVisible);
     QCOMPARE(m_page->visibilityState(), QWebPage::VisibilityStateVisible);
@@ -3234,7 +3246,9 @@ void tst_QWebPage::changeVisibilityState()
     stateString = m_page->mainFrame()->evaluateJavaScript("stateString");
     QVERIFY(stateString.type() == QVariant::String && stateString.toString() == QString("visible"));
     cpt = m_page->mainFrame()->evaluateJavaScript("cpt");
-    QVERIFY(cpt.type() == QVariant::Double && cpt.toDouble() == 5);
+    QCOMPARE(cpt.type(), QVariant::Double);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
+    QCOMPARE(cpt.toDouble(), 5.0);
 }
 
 void tst_QWebPage::contextMenuCopy()
@@ -3416,6 +3430,7 @@ void tst_QWebPage::undoActionHaveCustomText()
     m_page->mainFrame()->evaluateJavaScript("document.execCommand('indent', true);");
     QString alignActionText = m_page->action(QWebPage::Undo)->text();
 
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
     QVERIFY(typingActionText != alignActionText);
 }
 
@@ -3434,13 +3449,15 @@ void tst_QWebPage::openWindowDefaultSize()
 
     QRect requestedGeometry = page.createdWindows[0]->requestedGeometry;
     // Check default size has been requested.
-    QVERIFY(requestedGeometry.width() == 0);
-    QVERIFY(requestedGeometry.height() == 0);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
+    QCOMPARE(requestedGeometry.width(), 0);
+    QEXPECT_FAIL("", "https://github.com/qtwebkit/qtwebkit/issues/913", Continue);
+    QCOMPARE(requestedGeometry.height(), 0);
 
     requestedGeometry = page.createdWindows[1]->requestedGeometry;
     // Check minimum size has been requested.
-    QVERIFY(requestedGeometry.width() == 100);
-    QVERIFY(requestedGeometry.height() == 100);
+    QCOMPARE(requestedGeometry.width(), 100);
+    QCOMPARE(requestedGeometry.height(), 100);
 }
 
 void tst_QWebPage::cssMediaTypeGlobalSetting()
diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.qrc b/tests/webkitwidgets/qwebpage/tst_qwebpage.qrc
index ab78dfa60..ab78dfa60 100644
--- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.qrc
+++ b/tests/webkitwidgets/qwebpage/tst_qwebpage.qrc
diff --git a/tests/webkitwidgets/qwebplugindatabase/qwebplugindatabase.pro b/tests/webkitwidgets/qwebplugindatabase/qwebplugindatabase.pro
new file mode 100644
index 000000000..ff6c49628
--- /dev/null
+++ b/tests/webkitwidgets/qwebplugindatabase/qwebplugindatabase.pro
@@ -0,0 +1,2 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/qwebplugindatabase/tst_qwebplugindatabase.cpp b/tests/webkitwidgets/qwebplugindatabase/tst_qwebplugindatabase.cpp
index 1d524e24a..1d524e24a 100644
--- a/Source/WebKit/qt/tests/qwebplugindatabase/tst_qwebplugindatabase.cpp
+++ b/tests/webkitwidgets/qwebplugindatabase/tst_qwebplugindatabase.cpp
diff --git a/tests/webkitwidgets/qwebsecurityorigin/qwebsecurityorigin.pro b/tests/webkitwidgets/qwebsecurityorigin/qwebsecurityorigin.pro
new file mode 100644
index 000000000..ff6c49628
--- /dev/null
+++ b/tests/webkitwidgets/qwebsecurityorigin/qwebsecurityorigin.pro
@@ -0,0 +1,2 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/qwebsecurityorigin/resources/test.html b/tests/webkitwidgets/qwebsecurityorigin/resources/test.html
index 43e25f26d..43e25f26d 100644
--- a/Source/WebKit/qt/tests/qwebsecurityorigin/resources/test.html
+++ b/tests/webkitwidgets/qwebsecurityorigin/resources/test.html
diff --git a/Source/WebKit/qt/tests/qwebsecurityorigin/tst_qwebsecurityorigin.cpp b/tests/webkitwidgets/qwebsecurityorigin/tst_qwebsecurityorigin.cpp
index 225c42d0a..225c42d0a 100644
--- a/Source/WebKit/qt/tests/qwebsecurityorigin/tst_qwebsecurityorigin.cpp
+++ b/tests/webkitwidgets/qwebsecurityorigin/tst_qwebsecurityorigin.cpp
diff --git a/Source/WebKit/qt/tests/qwebsecurityorigin/tst_qwebsecurityorigin.qrc b/tests/webkitwidgets/qwebsecurityorigin/tst_qwebsecurityorigin.qrc
index ec8d9c02d..ec8d9c02d 100644
--- a/Source/WebKit/qt/tests/qwebsecurityorigin/tst_qwebsecurityorigin.qrc
+++ b/tests/webkitwidgets/qwebsecurityorigin/tst_qwebsecurityorigin.qrc
diff --git a/tests/webkitwidgets/qwebview/qwebview.pro b/tests/webkitwidgets/qwebview/qwebview.pro
new file mode 100644
index 000000000..ff6c49628
--- /dev/null
+++ b/tests/webkitwidgets/qwebview/qwebview.pro
@@ -0,0 +1,2 @@
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/Source/WebKit/qt/tests/qwebview/resources/frame_a.html b/tests/webkitwidgets/qwebview/resources/frame_a.html
index 9ff68f13a..9ff68f13a 100644
--- a/Source/WebKit/qt/tests/qwebview/resources/frame_a.html
+++ b/tests/webkitwidgets/qwebview/resources/frame_a.html
diff --git a/Source/WebKit/qt/tests/qwebview/resources/index.html b/tests/webkitwidgets/qwebview/resources/index.html
index c53ad09a7..c53ad09a7 100644
--- a/Source/WebKit/qt/tests/qwebview/resources/index.html
+++ b/tests/webkitwidgets/qwebview/resources/index.html
diff --git a/Source/WebKit/qt/tests/qwebview/resources/input_types.html b/tests/webkitwidgets/qwebview/resources/input_types.html
index 2e893afae..2e893afae 100644
--- a/Source/WebKit/qt/tests/qwebview/resources/input_types.html
+++ b/tests/webkitwidgets/qwebview/resources/input_types.html
diff --git a/Source/WebKit/qt/tests/qwebview/resources/scrolltest_page.html b/tests/webkitwidgets/qwebview/resources/scrolltest_page.html
index 18fcbbebe..18fcbbebe 100644
--- a/Source/WebKit/qt/tests/qwebview/resources/scrolltest_page.html
+++ b/tests/webkitwidgets/qwebview/resources/scrolltest_page.html
diff --git a/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/tests/webkitwidgets/qwebview/tst_qwebview.cpp
index f4db608d4..e793d3fbf 100644
--- a/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp
+++ b/tests/webkitwidgets/qwebview/tst_qwebview.cpp
@@ -134,7 +134,7 @@ void tst_QWebView::reusePage_data()
 void tst_QWebView::reusePage()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
-        W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
+        QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
 
     QDir::setCurrent(TESTS_SOURCE_DIR);
 
@@ -196,6 +196,8 @@ private Q_SLOTS:
 // Should not crash.
 void tst_QWebView::crashTests()
 {
+    QSKIP("https://github.com/qtwebkit/qtwebkit/issues/913");
+
     // Test if loading can be stopped in loadProgress handler without crash.
     // Test page should have frames.
     QWebView view;
diff --git a/Source/WebKit/qt/tests/qwebview/tst_qwebview.qrc b/tests/webkitwidgets/qwebview/tst_qwebview.qrc
index e4b9ad776..e4b9ad776 100644
--- a/Source/WebKit/qt/tests/qwebview/tst_qwebview.qrc
+++ b/tests/webkitwidgets/qwebview/tst_qwebview.qrc
diff --git a/Source/WebKit/qt/tests/resources/image2.png b/tests/webkitwidgets/resources/image2.png
index 8d703640c..8d703640c 100644
--- a/Source/WebKit/qt/tests/resources/image2.png
+++ b/tests/webkitwidgets/resources/image2.png
diff --git a/tests/webkitwidgets/tests.pri b/tests/webkitwidgets/tests.pri
new file mode 100644
index 000000000..b48806286
--- /dev/null
+++ b/tests/webkitwidgets/tests.pri
@@ -0,0 +1,22 @@
+TEMPLATE = app
+
+VPATH += $$_PRO_FILE_PWD_
+TARGET = tst_$$TARGET
+
+# Load mobilityconfig if Qt Mobility is available
+load(mobilityconfig, true)
+contains(MOBILITY_CONFIG, multimedia) {
+    # This define is used by tests depending on Qt Multimedia
+    DEFINES -= WTF_USE_QT_MULTIMEDIA=0
+    DEFINES += WTF_USE_QT_MULTIMEDIA=1
+}
+
+SOURCES += $${TARGET}.cpp
+INCLUDEPATH += \
+    $$PWD \
+    $$PWD/../Api
+
+QT += testlib network webkitwidgets widgets
+
+# This define is used by some tests to look up resources in the source tree
+DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
diff --git a/Source/WebKit/qt/tests/util.h b/tests/webkitwidgets/util.h
index 4925aa4c7..19955b810 100644
--- a/Source/WebKit/qt/tests/util.h
+++ b/tests/webkitwidgets/util.h
@@ -77,5 +77,3 @@ public:
         return result;
     }
 };
-
-#define W_QSKIP(a, b) QSKIP(a)
diff --git a/tests/webkitwidgets/webkitwidgets.pro b/tests/webkitwidgets/webkitwidgets.pro
new file mode 100644
index 000000000..8b900139f
--- /dev/null
+++ b/tests/webkitwidgets/webkitwidgets.pro
@@ -0,0 +1,16 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += \
+    cmake \
+    qobjectbridge \
+    qwebframe \
+    qwebpage \
+    qwebelement \
+    qgraphicswebview \
+    qwebhistoryinterface \
+    qwebview \
+    qwebhistory \
+    qwebinspector \
+    qwebsecurityorigin \
+    hybridPixmap