From 526f111b059e18414e3a03c7f9a2b8c2ed65be7a Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 9 Sep 2013 15:55:04 +0200 Subject: Allow QtQuick private headers to be used with QT_NO_KEYWORDS. This is necessary for the QtWebEngine module. This also adds an empty nokeywords test using the same mechanism as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts at compile time. Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe Reviewed-by: Simon Hausmann --- src/particles/qquickdirection_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/particles/qquickdirection_p.h') diff --git a/src/particles/qquickdirection_p.h b/src/particles/qquickdirection_p.h index 4ceae16b35..51e7679fda 100644 --- a/src/particles/qquickdirection_p.h +++ b/src/particles/qquickdirection_p.h @@ -54,9 +54,9 @@ public: explicit QQuickDirection(QObject *parent = 0); virtual const QPointF sample(const QPointF &from); -signals: +Q_SIGNALS: -public slots: +public Q_SLOTS: protected: }; -- cgit v1.2.3