diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/cmake | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/cmake')
| -rw-r--r-- | Source/cmake/OptionsEfl.cmake | 2 | ||||
| -rw-r--r-- | Source/cmake/OptionsWinCE.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
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) |