From 5186ddc1d962cc2cb0e2a937c2a397c019de3a6e Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 12 May 2011 10:00:26 +1000 Subject: [PATCH] Fixed incorrect usage of `signals', `slots' in headers Qt headers must use Q_SIGNALS, Q_SLOTS. Reviewed-by: Jason McDonald Change-Id: I54b3322befd8f133d44aa48f3aa7cd96785d2e24 --- src/declarative/items/qsgcanvas.h | 4 ++-- src/declarative/scenegraph/util/qsgengine.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qsgcanvas.h index d076d09..54701ca 100644 --- a/src/declarative/items/qsgcanvas.h +++ b/src/declarative/items/qsgcanvas.h @@ -75,7 +75,7 @@ public: QSGEngine *sceneGraphEngine() const; -signals: +Q_SIGNALS: void sceneGraphInitialized(); protected: @@ -100,7 +100,7 @@ protected: virtual void wheelEvent(QWheelEvent *); #endif -private slots: +private Q_SLOTS: void sceneGraphChanged(); void maybeUpdate(); diff --git a/src/declarative/scenegraph/util/qsgengine.h b/src/declarative/scenegraph/util/qsgengine.h index 9e07f35..1665d88 100644 --- a/src/declarative/scenegraph/util/qsgengine.h +++ b/src/declarative/scenegraph/util/qsgengine.h @@ -79,7 +79,7 @@ public: void setClearColor(const QColor &color); QColor clearColor() const; -signals: +Q_SIGNALS: void beforeRendering(); void afterRendering(); -- 1.7.2.5