1 files changed, 12 insertions, 9 deletions
diff --git a/Source/WebKit/qt/tests/CMakeLists.txt b/Source/WebKit/qt/tests/CMakeLists.txt
index 8c96f4cbf..685896bfe 100644
--- a/Source/WebKit/qt/tests/CMakeLists.txt
+++ b/Source/WebKit/qt/tests/CMakeLists.txt
@@ -1,26 +1,23 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 include_directories(
-    "${CMAKE_BINARY_DIR}"
     "${CMAKE_SOURCE_DIR}/Source"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
-    "${DERIVED_SOURCES_WEBKIT_DIR}"
-    "${WEBCORE_DIR}"
-    "${WEBCORE_DIR}/platform"
-    "${WEBCORE_DIR}/platform/qt"
     "${WEBKIT_DIR}/qt/Api"
     "${WEBKIT_DIR}/qt/WidgetApi"
-
-    "${JAVASCRIPTCORE_DIR}"
-    "${WTF_DIR}"
 )
 
 include_directories(SYSTEM
     ${ICU_INCLUDE_DIRS}
+    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${Qt5Widgets_INCLUDE_DIRS}
     ${Qt5Test_INCLUDE_DIRS}
 )
 
+if (ENABLE_TEST_SUPPORT)
+    add_definitions(-DHAVE_QTTESTSUPPORT)
+endif ()
+
 set(QtWK1ApiTests_LIBRARIES
     ${Qt5Gui_LIBRARIES}
     ${Qt5Network_LIBRARIES}
@@ -35,6 +32,7 @@ set(QtWK1ApiTests_RUNTIME_OUTPUT_DIRECTORY
 )
 
 set(QtWK1ApiTests
+    hybridPixmap
     qgraphicswebview
     qobjectbridge
     qwebelement
@@ -42,18 +40,23 @@ set(QtWK1ApiTests
     qwebhistory
     qwebhistoryinterface
     qwebinspector
+    qwebpage
     qwebsecurityorigin
     qwebview
 )
 
+set(tst_hybridPixmap_SOURCES hybridPixmap/widget.cpp)
+qt5_wrap_ui(tst_hybridPixmap_SOURCES hybridPixmap/widget.ui)
+
 if (ENABLE_API_TESTS)
     foreach (testName ${QtWK1ApiTests})
-        set(tst_${testName}_SOURCES ${testName}/tst_${testName}.cpp)
+        list(APPEND tst_${testName}_SOURCES ${testName}/tst_${testName}.cpp)
         if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${testName}/tst_${testName}.qrc")
             qt5_add_resources(tst_${testName}_SOURCES ${testName}/tst_${testName}.qrc)
         endif ()
 
         add_executable(tst_${testName} ${tst_${testName}_SOURCES})
+        target_include_directories(tst_${testName} PRIVATE ${testName})
         target_link_libraries(tst_${testName} ${QtWK1ApiTests_LIBRARIES})
         set_target_properties(tst_${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${QtWK1ApiTests_RUNTIME_OUTPUT_DIRECTORY})