Title: [261275] trunk
Revision
261275
Author
[email protected]
Date
2020-05-07 01:40:00 -0700 (Thu, 07 May 2020)

Log Message

[WPE][Qt] Enable by default
https://bugs.webkit.org/show_bug.cgi?id=211517

Patch by Philippe Normand <[email protected]> on 2020-05-07
Reviewed by Adrian Perez de Castro.

.:

* Source/cmake/OptionsWPE.cmake: Now that the EWS and bots use the
Flatpak SDK, Qt5 libs are available so we can enable the module
and have bots run its tests.

Source/WebKit:

* PlatformWPE.cmake: Fix WPEQt build.

Modified Paths

Diff

Modified: trunk/ChangeLog (261274 => 261275)


--- trunk/ChangeLog	2020-05-07 08:33:30 UTC (rev 261274)
+++ trunk/ChangeLog	2020-05-07 08:40:00 UTC (rev 261275)
@@ -1,3 +1,14 @@
+2020-05-07  Philippe Normand  <[email protected]>
+
+        [WPE][Qt] Enable by default
+        https://bugs.webkit.org/show_bug.cgi?id=211517
+
+        Reviewed by Adrian Perez de Castro.
+
+        * Source/cmake/OptionsWPE.cmake: Now that the EWS and bots use the
+        Flatpak SDK, Qt5 libs are available so we can enable the module
+        and have bots run its tests.
+
 2020-05-05  Víctor Manuel Jáquez Leal  <[email protected]>
 
         Compile GPUProcess in WPE port as experimental feature

Modified: trunk/Source/WebKit/ChangeLog (261274 => 261275)


--- trunk/Source/WebKit/ChangeLog	2020-05-07 08:33:30 UTC (rev 261274)
+++ trunk/Source/WebKit/ChangeLog	2020-05-07 08:40:00 UTC (rev 261275)
@@ -1,4 +1,13 @@
+2020-05-07  Philippe Normand  <[email protected]>
 
+        [WPE][Qt] Enable by default
+        https://bugs.webkit.org/show_bug.cgi?id=211517
+
+        Reviewed by Adrian Perez de Castro.
+
+        * PlatformWPE.cmake: Fix WPEQt build.
+
+
 2020-05-06  Alex Christensen  <[email protected]>
 
         Fix webkitpy tests after r261254

Modified: trunk/Source/WebKit/PlatformWPE.cmake (261274 => 261275)


--- trunk/Source/WebKit/PlatformWPE.cmake	2020-05-07 08:33:30 UTC (rev 261274)
+++ trunk/Source/WebKit/PlatformWPE.cmake	2020-05-07 08:40:00 UTC (rev 261275)
@@ -384,9 +384,11 @@
 
     set(qtwpe_INCLUDE_DIRECTORIES
         ${CMAKE_BINARY_DIR}
+        ${GLIB_INCLUDE_DIRS}
         ${Qt5_INCLUDE_DIRS}
         ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
         ${LIBEPOXY_INCLUDE_DIRS}
+        ${LIBSOUP_INCLUDE_DIRS}
         ${WPEBACKEND_FDO_INCLUDE_DIRS}
     )
 

Modified: trunk/Source/cmake/OptionsWPE.cmake (261274 => 261275)


--- trunk/Source/cmake/OptionsWPE.cmake	2020-05-07 08:33:30 UTC (rev 261274)
+++ trunk/Source/cmake/OptionsWPE.cmake	2020-05-07 08:40:00 UTC (rev 261275)
@@ -81,7 +81,7 @@
 WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
 WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF)
+WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${DEVELOPER_MODE})
 WEBKIT_OPTION_DEFINE(USE_SYSTEMD "Whether to enable journald logging" PUBLIC ON)
 
 # Private options specific to the WPE port.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to