aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-05-12 10:00:26 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-12 14:40:16 +1000
commit5186ddc1d962cc2cb0e2a937c2a397c019de3a6e (patch)
tree3195940287302590f1bf00e2fe26d3222f72606d
parent6fe601e4bcff790a335de949a20e223380ce9408 (diff)
Fixed incorrect usage of `signals', `slots' in headers
Qt headers must use Q_SIGNALS, Q_SLOTS. Reviewed-by: Jason McDonald Change-Id: I54b3322befd8f133d44aa48f3aa7cd96785d2e24
-rw-r--r--src/declarative/items/qsgcanvas.h4
-rw-r--r--src/declarative/scenegraph/util/qsgengine.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qsgcanvas.h
index d076d098ab..54701cae4f 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 9e07f3530d..1665d88ca3 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();