Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

5 files changed, 30 insertions, 27 deletions

diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
index d1b4abf52..fcbe429c0 100644
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
@@ -1,28 +1,33 @@
-SET(JSC_SOURCES
+set(JSC_SOURCES
     ../jsc.cpp
 )
 
-SET(JSC_LIBRARIES
-    ${WTF_LIBRARY_NAME}
-    ${JavaScriptCore_LIBRARY_NAME}
+set(JSC_LIBRARIES
+    WTF
+    JavaScriptCore
+    ${CMAKE_DL_LIBS}
 )
 
-IF ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
-    ADD_DEFINITIONS(-DSTATICALLY_LINKED_WITH_JavaScriptCore)
-ENDIF ()
+if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
+    add_definitions(-DSTATICALLY_LINKED_WITH_JavaScriptCore)
+endif ()
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
-INCLUDE_DIRECTORIES(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
-ADD_EXECUTABLE(${JSC_EXECUTABLE_NAME} ${JSC_SOURCES})
-TARGET_LINK_LIBRARIES(${JSC_EXECUTABLE_NAME} ${JSC_LIBRARIES})
-SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES FOLDER "JavaScriptCore")
+include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
+add_executable(jsc ${JSC_SOURCES})
+target_link_libraries(jsc ${JSC_LIBRARIES})
+set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore")
 
-IF (JSC_LINK_FLAGS)
-    ADD_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} LINK_FLAGS "${JSC_LINK_FLAGS}")
-ENDIF ()
+if (JSC_OUTPUT_NAME)
+    set_target_properties(jsc PROPERTIES OUTPUT_NAME ${JSC_OUTPUT_NAME})
+endif ()
 
-IF (SHOULD_INSTALL_JS_SHELL)
-    INSTALL(TARGETS ${JSC_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
-ENDIF ()
+if (JSC_LINK_FLAGS)
+    ADD_TARGET_PROPERTIES(jsc LINK_FLAGS "${JSC_LINK_FLAGS}")
+endif ()
+
+if (SHOULD_INSTALL_JS_SHELL)
+    install(TARGETS jsc DESTINATION "${EXEC_INSTALL_DIR}")
+endif ()
diff --git a/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake b/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake
index aff77caf7..2ec35c885 100644
--- a/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake
+++ b/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake
@@ -1,17 +1,16 @@
 FIND_STAGING_LIBRARY(SLOG2_LIBRARY slog2)
-LIST(APPEND JSC_LIBRARIES
+list(APPEND JSC_LIBRARIES
     ${ICUI18N_LIBRARY}
     ${ICUUC_LIBRARY}
     ${INTL_LIBRARY} # Required for x86 builds
     ${M_LIBRARY}
     ${Screen_LIBRARY}
-    ${Skia_QNX_LIBRARY}
     ${WebKitPlatform_LIBRARY}
     ${SLOG2_LIBRARY}
 )
 
-IF (PROFILING)
-    LIST(APPEND JSC_LIBRARIES
+if (PROFILING)
+    list(APPEND JSC_LIBRARIES
         ${PROFILING_LIBRARY}
     )
-ENDIF ()
+endif ()
diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake
index 22fe20a8e..1d2e8c1ad 100644
--- a/Source/JavaScriptCore/shell/PlatformEfl.cmake
+++ b/Source/JavaScriptCore/shell/PlatformEfl.cmake
@@ -1,5 +1,4 @@
-LIST(APPEND JSC_LIBRARIES
+list(APPEND JSC_LIBRARIES
     ${GLIB_LIBRARIES}
     ${ECORE_LIBRARIES}
-    ${CMAKE_DL_LIBS}
 )
diff --git a/Source/JavaScriptCore/shell/PlatformGTK.cmake b/Source/JavaScriptCore/shell/PlatformGTK.cmake
new file mode 100644
index 000000000..623183a2b
--- /dev/null
+++ b/Source/JavaScriptCore/shell/PlatformGTK.cmake
@@ -0,0 +1,3 @@
+list(APPEND JSC_LIBRARIES
+    ${GLIB_LIBRARIES}
+)
diff --git a/Source/JavaScriptCore/shell/PlatformWinCE.cmake b/Source/JavaScriptCore/shell/PlatformWinCE.cmake
deleted file mode 100644
index 0b7a3bfbf..000000000
--- a/Source/JavaScriptCore/shell/PlatformWinCE.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-LIST(APPEND JSC_SOURCES
-    ../os-win32/WinMain.cpp
-)