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

Merge remote-tracking branch 'origin/5.4' into dev

Browse Source 
Conflicts:
	.qmake.conf
	src/compositor/compositor_api/qwaylandsurface.cpp

Change-Id: I3ee40153c959dbe31ea685571c5a8bb1ae36606e
This commit is contained in:
Frederik Gladhorn 2014-12-29 16:20:02 +01:00
commit 5715d858a0
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ void QWaylandDataDevice::data_device_drop()
qDebug() << Q_FUNC_INFO << drag << m_dragOffer.data(); qDebug() << Q_FUNC_INFO << drag << m_dragOffer.data();
QMimeData *dragData; QMimeData *dragData = 0;
Qt::DropActions supportedActions; Qt::DropActions supportedActions;
if (drag) { if (drag) {
dragData = drag->mimeData(); dragData = drag->mimeData();

3
src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
View File

@ -46,6 +46,7 @@
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QMutexLocker>
#include <wayland-client.h> #include <wayland-client.h>
#include <unistd.h> #include <unistd.h>
@ -185,6 +186,7 @@ void QWaylandShmBackingStore::endPaint()
void QWaylandShmBackingStore::hidden() void QWaylandShmBackingStore::hidden()
{ {
QMutexLocker lock(&mMutex);
if (mFrameCallback) { if (mFrameCallback) {
wl_callback_destroy(mFrameCallback); wl_callback_destroy(mFrameCallback);
mFrameCallback = Q_NULLPTR; mFrameCallback = Q_NULLPTR;
@ -347,6 +349,7 @@ void QWaylandShmBackingStore::done(void *data, wl_callback *callback, uint32_t t
static_cast<QWaylandShmBackingStore *>(data); static_cast<QWaylandShmBackingStore *>(data);
if (callback != self->mFrameCallback) // others, like QWaylandWindow, may trigger callbacks too if (callback != self->mFrameCallback) // others, like QWaylandWindow, may trigger callbacks too
return; return;
QMutexLocker lock(&self->mMutex);
QWaylandWindow *window = self->waylandWindow(); QWaylandWindow *window = self->waylandWindow();
wl_callback_destroy(self->mFrameCallback); wl_callback_destroy(self->mFrameCallback);
self->mFrameCallback = 0; self->mFrameCallback = 0;

2
src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h
View File

@ -47,6 +47,7 @@
#include <qpa/qplatformbackingstore.h> #include <qpa/qplatformbackingstore.h>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <qpa/qplatformwindow.h> #include <qpa/qplatformwindow.h>
#include <QMutex>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -107,6 +108,7 @@ private:
QWaylandShmBuffer *mBackBuffer; QWaylandShmBuffer *mBackBuffer;
bool mFrontBufferIsDirty; bool mFrontBufferIsDirty;
bool mPainting; bool mPainting;
QMutex mMutex;
QSize mRequestedSize; QSize mRequestedSize;
Qt::WindowFlags mCurrentWindowFlags; Qt::WindowFlags mCurrentWindowFlags;