diff options
Diffstat (limited to 'Source/cmake/OptionsQt.cmake')
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index cec1a3d1b..252decd05 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -86,10 +86,12 @@ if (WIN32 OR APPLE) set(USE_LIBHYPHEN_DEFAULT OFF) set(USE_GSTREAMER_DEFAULT OFF) set(USE_QT_MULTIMEDIA_DEFAULT ON) + set(ENABLE_WEBKIT2_DEFAULT OFF) else () set(USE_LIBHYPHEN_DEFAULT ON) set(USE_GSTREAMER_DEFAULT ON) set(USE_QT_MULTIMEDIA_DEFAULT OFF) + set(ENABLE_WEBKIT2_DEFAULT ON) endif () if (CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -131,6 +133,8 @@ WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR_UI "Include Inspector UI into resources" P WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_PRINT_SUPPORT "Enable support for printing web pages" PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_QT_GESTURE_EVENTS "Enable support for gesture events (required for mouse in WK2)" PUBLIC ON) +WEBKIT_OPTION_DEFINE(ENABLE_QT_WEBCHANNEL "Enable support for Qt WebChannel" PUBLIC ON) +WEBKIT_OPTION_DEFINE(ENABLE_WEBKIT2 "Enable WebKit2 (QML API)" PUBLIC ${ENABLE_WEBKIT2_DEFAULT}) WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${ENABLE_X11_TARGET_DEFAULT}) option(GENERATE_DOCUMENTATION "Generate HTML and QCH documentation" OFF) @@ -149,7 +153,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALLINONE_BUILD PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PUBLIC OFF) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PUBLIC ON) @@ -185,6 +189,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ${ENABLE_FTL_DEFAULT}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR_POPOVER PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) @@ -209,6 +214,8 @@ WEBKIT_OPTION_DEPEND(ENABLE_WEB_AUDIO USE_GSTREAMER) WEBKIT_OPTION_DEPEND(ENABLE_LEGACY_WEB_AUDIO USE_GSTREAMER) WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SOURCE USE_GSTREAMER) +WEBKIT_OPTION_DEPEND(ENABLE_QT_WEBCHANNEL ENABLE_WEBKIT2) + # While it's possible to have UI-less NPAPI plugins without X11, we don't support this case yet if (UNIX AND NOT APPLE) WEBKIT_OPTION_DEPEND(ENABLE_NETSCAPE_PLUGIN_API ENABLE_X11_TARGET) @@ -237,7 +244,6 @@ if (APPLE AND CMAKE_SYSTEM_VERSION VERSION_LESS 14.0.0) endif () set(ENABLE_WEBKIT ON) -set(ENABLE_WEBKIT2 OFF) set(WTF_USE_UDIS86 1) get_target_property(QT_CORE_TYPE Qt5::Core TYPE) @@ -388,6 +394,11 @@ if (ENABLE_API_TESTS OR ENABLE_TEST_SUPPORT) list(APPEND QT_REQUIRED_COMPONENTS Test ) + if (ENABLE_WEBKIT2) + list(APPEND QT_REQUIRED_COMPONENTS + QuickTest + ) + endif () endif () if (ENABLE_GEOLOCATION) @@ -405,6 +416,20 @@ if (ENABLE_PRINT_SUPPORT) SET_AND_EXPOSE_TO_BUILD(HAVE_QTPRINTSUPPORT 1) endif () +if (ENABLE_WEBKIT2) + list(APPEND QT_REQUIRED_COMPONENTS + Quick + ) + SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE) + SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_MULTIPROCESS TRUE) +endif () + +if (ENABLE_QT_WEBCHANNEL) + list(APPEND QT_REQUIRED_COMPONENTS + WebChannel + ) +endif () + find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS ${QT_REQUIRED_COMPONENTS}) if (QT_STATIC_BUILD) foreach (qt_module ${QT_REQUIRED_COMPONENTS}) @@ -490,6 +515,17 @@ if (ENABLE_NETSCAPE_PLUGIN_API) SET_AND_EXPOSE_TO_BUILD(ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE 1) SET_AND_EXPOSE_TO_BUILD(ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1) endif () + + if (ENABLE_WEBKIT2) + if (ENABLE_X11_TARGET) + set(ENABLE_PLUGIN_PROCESS 1) + SET_AND_EXPOSE_TO_BUILD(PLUGIN_ARCHITECTURE_X11 1) + SET_AND_EXPOSE_TO_BUILD(PLUGIN_ARCHITECTURE_UNSUPPORTED 0) + else () + SET_AND_EXPOSE_TO_BUILD(PLUGIN_ARCHITECTURE_X11 0) + SET_AND_EXPOSE_TO_BUILD(PLUGIN_ARCHITECTURE_UNSUPPORTED 1) + endif () + endif () endif () if (ENABLE_X11_TARGET) |