Return wl_surface* QWaylandWindow::winId()
Required when you want to use some of the wayland protocols (For example: Keyboard shortcuts inhibit) Fixes: QTBUG-67919 Fixes: QTBUG-93103 Fixes: QTBUG-94729 Change-Id: I112c4c3eac99187317dce8de59a77ba3b0e70d17 Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
parent
ab9d58cd42
commit
33dcb1d7ec
@ -60,8 +60,6 @@ QWaylandWindow::QWaylandWindow(QWindow *window, QWaylandDisplay *display)
|
||||
mFrameCallbackTimeout = frameCallbackTimeout;
|
||||
}
|
||||
|
||||
static WId id = 1;
|
||||
mWindowId = id++;
|
||||
initializeWlSurface();
|
||||
|
||||
connect(this, &QWaylandWindow::wlSurfaceCreated, this,
|
||||
@ -351,7 +349,7 @@ QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
|
||||
|
||||
WId QWaylandWindow::winId() const
|
||||
{
|
||||
return mWindowId;
|
||||
return reinterpret_cast<WId>(wlSurface());
|
||||
}
|
||||
|
||||
void QWaylandWindow::setParent(const QPlatformWindow *parent)
|
||||
|
@ -295,7 +295,6 @@ protected:
|
||||
GestureState mGestureState = GestureNotActive;
|
||||
#endif
|
||||
|
||||
WId mWindowId;
|
||||
bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
|
||||
int mFrameCallbackCheckIntervalTimerId = -1;
|
||||
QAtomicInt mWaitingForUpdateDelivery = false;
|
||||
|
Loading…
x
Reference in New Issue
Block a user