Title: [266141] trunk
- Revision
- 266141
- Author
- clo...@igalia.com
- Date
- 2020-08-25 13:20:59 -0700 (Tue, 25 Aug 2020)
Log Message
[WPE][Qt] Fix qt-wpe-minibrowser on Debian10
https://bugs.webkit.org/show_bug.cgi?id=215730
Reviewed by Philippe Normand.
Source/WebKit:
QWheelEvent position is not available on Qt < 5.14. Use posF instead in that case.
Tested with Qt 5.11
No new tests, is a build fix.
* UIProcess/API/wpe/qt/WPEQtViewBackend.cpp:
(WPEQtViewBackend::dispatchWheelEvent):
Tools:
When not running in flatpak the path to the qml directory is different.
* Scripts/run-qt-wpe-minibrowser:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (266140 => 266141)
--- trunk/Source/WebKit/ChangeLog 2020-08-25 19:09:16 UTC (rev 266140)
+++ trunk/Source/WebKit/ChangeLog 2020-08-25 20:20:59 UTC (rev 266141)
@@ -1,3 +1,18 @@
+2020-08-25 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE][Qt] Fix qt-wpe-minibrowser on Debian10
+ https://bugs.webkit.org/show_bug.cgi?id=215730
+
+ Reviewed by Philippe Normand.
+
+ QWheelEvent position is not available on Qt < 5.14. Use posF instead in that case.
+ Tested with Qt 5.11
+
+ No new tests, is a build fix.
+
+ * UIProcess/API/wpe/qt/WPEQtViewBackend.cpp:
+ (WPEQtViewBackend::dispatchWheelEvent):
+
2020-08-25 Jer Noble <jer.no...@apple.com>
[Mac] REGRESSION(r262322): Focusable elements are focused when exiting from video fullscreen mode.
Modified: trunk/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp (266140 => 266141)
--- trunk/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp 2020-08-25 19:09:16 UTC (rev 266140)
+++ trunk/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp 2020-08-25 20:20:59 UTC (rev 266141)
@@ -24,6 +24,7 @@
#include "WPEQtView.h"
#include <QGuiApplication>
#include <QOpenGLFunctions>
+#include <QtGlobal>
static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC imageTargetTexture2DOES;
@@ -297,18 +298,24 @@
wpe_view_backend_dispatch_pointer_event(backend(), &wpeEvent);
}
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+#define QWHEEL_POSITION position()
+#else
+#define QWHEEL_POSITION posF()
+#endif
+
void WPEQtViewBackend::dispatchWheelEvent(QWheelEvent* event)
{
QPoint delta = event->angleDelta();
QPoint numDegrees = delta / 8;
struct wpe_input_axis_2d_event wpeEvent;
- if (delta.y() == event->position().y())
+ if (delta.y() == event->QWHEEL_POSITION.y())
wpeEvent.x_axis = numDegrees.x();
else
wpeEvent.y_axis = numDegrees.y();
wpeEvent.base.type = static_cast<wpe_input_axis_event_type>(wpe_input_axis_event_type_mask_2d | wpe_input_axis_event_type_motion_smooth);
- wpeEvent.base.x = event->position().x();
- wpeEvent.base.y = event->position().y();
+ wpeEvent.base.x = event->QWHEEL_POSITION.x();
+ wpeEvent.base.y = event->QWHEEL_POSITION.y();
wpe_view_backend_dispatch_axis_event(backend(), &wpeEvent.base);
}
Modified: trunk/Tools/ChangeLog (266140 => 266141)
--- trunk/Tools/ChangeLog 2020-08-25 19:09:16 UTC (rev 266140)
+++ trunk/Tools/ChangeLog 2020-08-25 20:20:59 UTC (rev 266141)
@@ -1,3 +1,14 @@
+2020-08-25 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE][Qt] Fix qt-wpe-minibrowser on Debian10
+ https://bugs.webkit.org/show_bug.cgi?id=215730
+
+ Reviewed by Philippe Normand.
+
+ When not running in flatpak the path to the qml directory is different.
+
+ * Scripts/run-qt-wpe-minibrowser:
+
2020-08-25 Devin Rousso <drou...@apple.com>
REGRESSION(r265601): invalid blame URL copied when `include_revision` is `false`
Modified: trunk/Tools/Scripts/run-qt-wpe-minibrowser (266140 => 266141)
--- trunk/Tools/Scripts/run-qt-wpe-minibrowser 2020-08-25 19:09:16 UTC (rev 266140)
+++ trunk/Tools/Scripts/run-qt-wpe-minibrowser 2020-08-25 20:20:59 UTC (rev 266141)
@@ -50,7 +50,14 @@
checkFrameworks();
if (!inFlatpakSandbox()) {
- $libPath = "$productDir/lib/qml" if $productDir;
+ if ($productDir) {
+ for my $qmlsubdir ("lib/qml", "lib/qt5/qml") {
+ if (-d "$productDir/$qmlsubdir") {
+ $libPath = "$productDir/$qmlsubdir";
+ last;
+ }
+ }
+ }
$ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
