1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement QNativeInterface::Private::QWaylandScreen

Browse Source 
Change-Id: I2f5cc638f33fe0d884146342516efa7ce8474478
Task-number: QTBUG-94729
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
David Redondo 2022-10-12 09:01:07 +02:00
parent ea5bad9031
commit 9c5b09ee8d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/wayland/qwaylandscreen_p.h
View File

@ -16,6 +16,7 @@
// //
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <qpa/qplatformscreen_p.h>
#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtWaylandClient/qtwaylandclientglobal.h>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
@ -34,7 +35,10 @@ public:
QWaylandXdgOutputManagerV1(QWaylandDisplay *display, uint id, uint version); QWaylandXdgOutputManagerV1(QWaylandDisplay *display, uint id, uint version);
}; };
class Q_WAYLANDCLIENT_EXPORT QWaylandScreen : public QPlatformScreen, QtWayland::wl_output, QtWayland::zxdg_output_v1 class Q_WAYLANDCLIENT_EXPORT QWaylandScreen : public QPlatformScreen,
QtWayland::wl_output,
QtWayland::zxdg_output_v1,
public QNativeInterface::Private::QWaylandScreen
{ {
public: public:
QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id); QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id);
@ -70,7 +74,10 @@ public:
#endif #endif
uint32_t outputId() const { return m_outputId; } uint32_t outputId() const { return m_outputId; }
::wl_output *output() { return QtWayland::wl_output::object(); } ::wl_output *output() const override
{
return const_cast<::wl_output *>(QtWayland::wl_output::object());
}
static QWaylandScreen *waylandScreenFromWindow(QWindow *window); static QWaylandScreen *waylandScreenFromWindow(QWindow *window);
static QWaylandScreen *fromWlOutput(::wl_output *output); static QWaylandScreen *fromWlOutput(::wl_output *output);