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 <simon.hausmann@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
index 7931c4e18c..10c5a0f3c4 100644
--- a/src/qml/types/qqmldelegatemodel_p_p.h
+++ b/src/qml/types/qqmldelegatemodel_p_p.h
@@ -126,7 +126,7 @@ public:
     int groupIndex(Compositor::Group group);
 
     int modelIndex() const { return index; }
-    void setModelIndex(int idx) { index = idx; emit modelIndexChanged(); }
+    void setModelIndex(int idx) { index = idx; Q_EMIT modelIndexChanged(); }
 
     virtual QV4::Value get() { return QV4::QObjectWrapper::wrap(v4, this); }
 
@@ -260,11 +260,11 @@ public:
     void emitCreatedPackage(QQDMIncubationTask *incubationTask, QQuickPackage *package);
     void emitInitPackage(QQDMIncubationTask *incubationTask, QQuickPackage *package);
     void emitCreatedItem(QQDMIncubationTask *incubationTask, QObject *item) {
-        emit q_func()->createdItem(incubationTask->index[m_compositorGroup], item); }
+        Q_EMIT q_func()->createdItem(incubationTask->index[m_compositorGroup], item); }
     void emitInitItem(QQDMIncubationTask *incubationTask, QObject *item) {
-        emit q_func()->initItem(incubationTask->index[m_compositorGroup], item); }
+        Q_EMIT q_func()->initItem(incubationTask->index[m_compositorGroup], item); }
     void emitDestroyingPackage(QQuickPackage *package);
-    void emitDestroyingItem(QObject *item) { emit q_func()->destroyingItem(item); }
+    void emitDestroyingItem(QObject *item) { Q_EMIT q_func()->destroyingItem(item); }
     void removeCacheItem(QQmlDelegateModelItem *cacheItem);
 
     void updateFilterGroup();