From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/cmake/OptionsEfl.cmake | 2 +- Source/cmake/OptionsWinCE.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/cmake') diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index da9fe6c..74fcbd7 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -66,6 +66,7 @@ WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON) WEBKIT_FEATURE(ENABLE_DATABASE "Enable database" DEFAULT ON) WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT ON HTML) +WEBKIT_FEATURE(ENABLE_DATA_TRANSFER_ITEMS "Enable data transfer items" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_DOM_STORAGE "Enable DOM storage" DEFAULT ON) WEBKIT_FEATURE(ENABLE_EVENTSOURCE "Enable event source" DEFAULT ON) WEBKIT_FEATURE(ENABLE_FAST_MALLOC "Enable TCmalloc instead of system's allocator" DEFAULT ON) @@ -144,7 +145,6 @@ IF (ENABLE_VIDEO) ENDIF() IF (ENABLE_GLIB_SUPPORT) - FIND_PACKAGE(GDK 2.10 REQUIRED) FIND_PACKAGE(Glib REQUIRED) FIND_PACKAGE(Gthread REQUIRED) ENDIF () diff --git a/Source/cmake/OptionsWinCE.cmake b/Source/cmake/OptionsWinCE.cmake index 55f8caa..efd33a0 100644 --- a/Source/cmake/OptionsWinCE.cmake +++ b/Source/cmake/OptionsWinCE.cmake @@ -26,6 +26,7 @@ WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_DATABASE "Enable database" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT OFF HTML) +WEBKIT_FEATURE(ENABLE_DATA_TRANSFER_ITEMS "Enable data transfer items" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_DOM_STORAGE "Enable DOM storage" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_EVENTSOURCE "Enable event source" DEFAULT ON) WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON) -- cgit v1.1