summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <olivier.blin@softathome.com>2015-02-13 11:47:52 +0100
committerOlivier Blin <qt@blino.org>2015-03-20 20:41:26 +0000
commit9641788a2db0287605402d7f8d1b53d2d69a545e (patch)
treedd0c9be84b1381f8e36b8ff5e3d3791e780f20b6
parent1e32e71403a6a9cb117343464fbc34564598e831 (diff)
Fix build with gcc <= 4.5
nullptr is not defined with gcc <= 4.5, use 0 instead. Change-Id: I90d9170e57258f26b8ba7770a957a135539364de Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
-rw-r--r--src/compositor/compositor_api/qwaylandsurfaceview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurfaceview.cpp b/src/compositor/compositor_api/qwaylandsurfaceview.cpp
index 664ab9805..5cf331966 100644
--- a/src/compositor/compositor_api/qwaylandsurfaceview.cpp
+++ b/src/compositor/compositor_api/qwaylandsurfaceview.cpp
@@ -69,7 +69,7 @@ QWaylandSurfaceView::~QWaylandSurfaceView()
if (d->surface) {
QWaylandInputDevice *i = d->surface->compositor()->defaultInputDevice();
if (i->mouseFocus() == this)
- i->setMouseFocus(nullptr, QPointF());
+ i->setMouseFocus(Q_NULLPTR, QPointF());
d->surface->destroy();
d->surface->d_func()->views.removeOne(this);