From ac734d1bf343d64d6df93589ce1d8c9a2f7dbe9c Mon Sep 17 00:00:00 2001 From: Thomas Sondergaard Date: Mon, 30 Nov 2015 20:47:05 +0100 Subject: Avoid foreach in public headers for QT_NO_KEYWORDS compatibility Fix QT_NO_KEYWORDS regression introduced in commit 575ee40621f7 (2015-10-06). Change-Id: I24ad330074fbcd521fae7efceac50a87bc8d4e40 Reviewed-by: Friedemann Kleint --- src/activeqt/control/qaxfactory.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index ac7a9e9..6d86a4e 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -220,7 +220,7 @@ public: factory = new QAxClass(typeLibID().toString(), appID().toString()); \ qRegisterMetaType(#Class"*"); \ keys = factory->featureList(); \ - foreach (const QString &key, keys) { \ + Q_FOREACH (const QString &key, keys) { \ factoryKeys += key; \ factories.insert(key, factory); \ creatable.insert(key, true); \ @@ -230,7 +230,7 @@ public: factory = new QAxClass(typeLibID().toString(), appID().toString()); \ qRegisterMetaType(#Class"*"); \ keys = factory->featureList(); \ - foreach (const QString &key, keys) { \ + Q_FOREACH (const QString &key, keys) { \ factoryKeys += key; \ factories.insert(key, factory); \ creatable.insert(key, false); \ -- cgit v1.2.3