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

Merge remote-tracking branch 'origin/5.10.0' into 5.10

Browse Source 
Change-Id: Id64ad5564f3cd85829ede15ebf33db13cd1587fa
This commit is contained in:
Liang Qi 2017-12-08 13:59:27 +01:00
commit 5e6e5d8930
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;