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/qml/jsruntime/qv4include_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/jsruntime/qv4include_p.h') diff --git a/src/qml/jsruntime/qv4include_p.h b/src/qml/jsruntime/qv4include_p.h index d6bbcd1a60..bb582cd2c7 100644 --- a/src/qml/jsruntime/qv4include_p.h +++ b/src/qml/jsruntime/qv4include_p.h @@ -80,7 +80,7 @@ public: static QV4::Value include(QV4::SimpleCallContext *ctx); -private slots: +private Q_SLOTS: void finished(); private: -- cgit v1.2.3