summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Sondergaard <thomas.sondergaard@karoshealth.com>2015-11-30 20:47:05 +0100
committerThomas Sondergaard <thomas.sondergaard@karoshealth.com>2015-12-01 08:51:48 +0000
commitac734d1bf343d64d6df93589ce1d8c9a2f7dbe9c (patch)
tree6b84cab976c38041d76ae94132d1de2cf09f4e8f
parent1fc0866f4fc07b6ae503bdd24c6fe98d0714ed2a (diff)
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 <Friedemann.Kleint@theqtcompany.com>
-rw-r--r--src/activeqt/control/qaxfactory.h4
1 files 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<Class>(typeLibID().toString(), appID().toString()); \
qRegisterMetaType<Class*>(#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<Class>(typeLibID().toString(), appID().toString()); \
qRegisterMetaType<Class*>(#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); \