Title: [256727] trunk
- Revision
- 256727
- Author
- [email protected]
- Date
- 2020-02-17 02:54:46 -0800 (Mon, 17 Feb 2020)
Log Message
[WPE] Change the QML plugin install path
https://bugs.webkit.org/show_bug.cgi?id=207761
Reviewed by Philippe Normand.
Source/WebKit:
This way there's no need to set QML2_IMPORT_PATH manually.
* PlatformWPE.cmake:
Tools:
* Scripts/run-qt-wpe-minibrowser:
* glib/api_test_runner.py:
(TestRunner._run_test_qt):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (256726 => 256727)
--- trunk/Source/WebKit/ChangeLog 2020-02-17 10:13:00 UTC (rev 256726)
+++ trunk/Source/WebKit/ChangeLog 2020-02-17 10:54:46 UTC (rev 256727)
@@ -1,3 +1,14 @@
+2020-02-17 Alberto Garcia <[email protected]>
+
+ [WPE] Change the QML plugin install path
+ https://bugs.webkit.org/show_bug.cgi?id=207761
+
+ Reviewed by Philippe Normand.
+
+ This way there's no need to set QML2_IMPORT_PATH manually.
+
+ * PlatformWPE.cmake:
+
2020-02-16 Fujii Hironori <[email protected]>
Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
Modified: trunk/Source/WebKit/PlatformWPE.cmake (256726 => 256727)
--- trunk/Source/WebKit/PlatformWPE.cmake 2020-02-17 10:13:00 UTC (rev 256726)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2020-02-17 10:54:46 UTC (rev 256727)
@@ -394,16 +394,16 @@
target_compile_definitions(qtwpe PUBLIC QT_NO_KEYWORDS=1)
target_link_libraries(qtwpe ${qtwpe_LIBRARIES})
target_include_directories(qtwpe SYSTEM PRIVATE ${qtwpe_INCLUDE_DIRECTORIES})
- install(TARGETS qtwpe DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/qml/org/wpewebkit/qtwpe/")
- install(FILES ${WEBKIT_DIR}/UIProcess/API/wpe/qt/qmldir DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/qml/org/wpewebkit/qtwpe/")
+ install(TARGETS qtwpe DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml/org/wpewebkit/qtwpe/")
+ install(FILES ${WEBKIT_DIR}/UIProcess/API/wpe/qt/qmldir DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml/org/wpewebkit/qtwpe/")
- file(MAKE_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/qml/org/wpewebkit/qtwpe)
+ file(MAKE_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/qt5/qml/org/wpewebkit/qtwpe)
add_custom_command(TARGET qtwpe POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libqtwpe.so
- ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/qml/org/wpewebkit/qtwpe)
+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/qt5/qml/org/wpewebkit/qtwpe)
add_custom_command(TARGET qtwpe POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
${WEBKIT_DIR}/UIProcess/API/wpe/qt/qmldir
- ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/qml/org/wpewebkit/qtwpe)
+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/qt5/qml/org/wpewebkit/qtwpe)
endif ()
install(TARGETS WPEInjectedBundle
Modified: trunk/Tools/ChangeLog (256726 => 256727)
--- trunk/Tools/ChangeLog 2020-02-17 10:13:00 UTC (rev 256726)
+++ trunk/Tools/ChangeLog 2020-02-17 10:54:46 UTC (rev 256727)
@@ -1,3 +1,14 @@
+2020-02-17 Alberto Garcia <[email protected]>
+
+ [WPE] Change the QML plugin install path
+ https://bugs.webkit.org/show_bug.cgi?id=207761
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/run-qt-wpe-minibrowser:
+ * glib/api_test_runner.py:
+ (TestRunner._run_test_qt):
+
2020-02-16 Fujii Hironori <[email protected]>
Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
Modified: trunk/Tools/Scripts/run-qt-wpe-minibrowser (256726 => 256727)
--- trunk/Tools/Scripts/run-qt-wpe-minibrowser 2020-02-17 10:13:00 UTC (rev 256726)
+++ trunk/Tools/Scripts/run-qt-wpe-minibrowser 2020-02-17 10:54:46 UTC (rev 256727)
@@ -38,7 +38,7 @@
my $configuration = passedConfiguration();
my $productDir = productDir();
-$libPath = "/app/webkit/WebKitBuild/$configuration/lib/qml" if $configuration;
+$libPath = "/app/webkit/WebKitBuild/$configuration/lib/qt5/qml" if $configuration;
$ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
runInFlatpakIfAvailable("/app/webkit/Tools/Scripts/run-qt-wpe-minibrowser");
Modified: trunk/Tools/glib/api_test_runner.py (256726 => 256727)
--- trunk/Tools/glib/api_test_runner.py 2020-02-17 10:13:00 UTC (rev 256726)
+++ trunk/Tools/glib/api_test_runner.py 2020-02-17 10:54:46 UTC (rev 256727)
@@ -170,7 +170,7 @@
def _run_test_qt(self, test_program):
env = self._test_env
env['XDG_SESSION_TYPE'] = 'wayland'
- env['QML2_IMPORT_PATH'] = common.library_build_path('qml')
+ env['QML2_IMPORT_PATH'] = common.library_build_path('qt5', 'qml')
name = os.path.basename(test_program)
if not hasattr(subprocess, 'TimeoutExpired'):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
