diff options
| author | Bhushan Shah <bshah@kde.org> | 2015-05-17 12:57:49 +0530 |
|---|---|---|
| committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-05-17 08:18:22 +0000 |
| commit | f15384fea6f638bcfeab5c6a19b85e958ce7f917 (patch) | |
| tree | c7142c4a4daf08272b927ea91ded4adb4f05e2bc /src | |
| parent | 11a28b2fed8e15f755ded5c1368386ce8ad428e2 (diff) | |
| download | qtwayland-f15384fea6f638bcfeab5c6a19b85e958ce7f917.tar.gz qtwayland-f15384fea6f638bcfeab5c6a19b85e958ce7f917.tar.bz2 qtwayland-f15384fea6f638bcfeab5c6a19b85e958ce7f917.zip | |
Fix the build error in public headers
One should always use Q_SLOTS/Q_SIGNALS in then public headers
Change-Id: Ibbba0d3ff402bd320049bcd58ced07ad1342ef3b
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.h | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurfaceitem.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h index bc47e676..653d74c1 100644 --- a/src/compositor/compositor_api/qwaylandsurface.h +++ b/src/compositor/compositor_api/qwaylandsurface.h @@ -227,7 +227,7 @@ public: static QWaylandSurface *fromResource(::wl_resource *resource); -public slots: +public Q_SLOTS: void updateSelection(); protected: diff --git a/src/compositor/compositor_api/qwaylandsurfaceitem.h b/src/compositor/compositor_api/qwaylandsurfaceitem.h index 7af8c882..91dc6879 100644 --- a/src/compositor/compositor_api/qwaylandsurfaceitem.h +++ b/src/compositor/compositor_api/qwaylandsurfaceitem.h @@ -102,11 +102,11 @@ protected: void touchEvent(QTouchEvent *event); void mouseUngrabEvent() Q_DECL_OVERRIDE; -public slots: +public Q_SLOTS: virtual void takeFocus(QWaylandInputDevice *device = 0); void setPaintEnabled(bool paintEnabled); -private slots: +private Q_SLOTS: void surfaceMapped(); void surfaceUnmapped(); void parentChanged(QWaylandSurface *newParent, QWaylandSurface *oldParent); |