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

Merge remote-tracking branch 'origin/5.9.4' into 5.9

Browse Source 
Change-Id: If72cba3251b792028a51f815f2f0cb064779bcec
This commit is contained in:
Liang Qi 2018-01-18 11:02:23 +01:00
commit c177b75420
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/wayland-egl.pro
View File

@ -7,6 +7,8 @@ OTHER_FILES += \
SOURCES += main.cpp SOURCES += main.cpp
TARGET = qt-plugin-wayland-egl
PLUGIN_TYPE = wayland-graphics-integration-client PLUGIN_TYPE = wayland-graphics-integration-client
PLUGIN_CLASS_NAME = QWaylandEglClientBufferPlugin PLUGIN_CLASS_NAME = QWaylandEglClientBufferPlugin
load(qt_plugin) load(qt_plugin)

2
src/plugins/platforms/wayland/qwaylandbuffer.cpp
View File

@ -66,7 +66,7 @@ void QWaylandBuffer::init(wl_buffer *buf)
void QWaylandBuffer::release(void *data, wl_buffer *) void QWaylandBuffer::release(void *data, wl_buffer *)
{ {
static_cast<QWaylandBuffer *>(data)->mBusy--; static_cast<QWaylandBuffer *>(data)->mBusy = false;
} }
const wl_buffer_listener QWaylandBuffer::listener = { const wl_buffer_listener QWaylandBuffer::listener = {

6
src/plugins/platforms/wayland/qwaylandbuffer_p.h
View File

@ -73,14 +73,14 @@ public:
virtual QSize size() const = 0; virtual QSize size() const = 0;
virtual int scale() const { return 1; } virtual int scale() const { return 1; }
void setBusy() { mBusy++; } void setBusy() { mBusy = true; }
bool busy() const { return mBusy > 0; } bool busy() const { return mBusy; }
protected: protected:
struct wl_buffer *mBuffer; struct wl_buffer *mBuffer;
private: private:
int mBusy; bool mBusy;
static void release(void *data, wl_buffer *); static void release(void *data, wl_buffer *);
static const wl_buffer_listener listener; static const wl_buffer_listener listener;

2
src/plugins/platforms/wayland/qwaylandxdgshellv6.cpp
View File

@ -125,6 +125,8 @@ QWaylandXdgSurfaceV6::QWaylandXdgSurfaceV6(QWaylandXdgShellV6 *shell, ::zxdg_sur
QWaylandXdgSurfaceV6::~QWaylandXdgSurfaceV6() QWaylandXdgSurfaceV6::~QWaylandXdgSurfaceV6()
{ {
if (m_toplevel)
zxdg_toplevel_v6_destroy(m_toplevel->object());
if (m_popup) if (m_popup)
zxdg_popup_v6_destroy(m_popup->object()); zxdg_popup_v6_destroy(m_popup->object());
destroy(); destroy();