summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-05-11 11:14:02 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-05-14 16:02:38 +0000
commitfb18b958d21de2c504b13e769df9e9a97e411f5d (patch)
tree564e072d184fc24a70b9447ec1fb52f7c419a6fc /src
parent6c58e787942ec0f21aa06fd5e774fa5462a75ebe (diff)
Enable QT_NO_FOREACH for all Qt3D libraries and plugins
Qt3D contains no Q_FOREACH loops anymore. Enable QT_NO_FOREACH so it stays that way. Change-Id: I1079ff1d87a7d6b38b9e9684e9d9f85561602b0a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/sceneparsers/assimp/assimp.pro3
-rw-r--r--src/plugins/sceneparsers/gltf/gltf.pro3
-rw-r--r--src/quick3d/imports/core/importscore.pro3
-rw-r--r--src/quick3d/imports/extras/importsextras.pro3
-rw-r--r--src/quick3d/imports/input/importsinput.pro3
-rw-r--r--src/quick3d/imports/logic/importslogic.pro3
-rw-r--r--src/quick3d/imports/render/importsrender.pro3
-rw-r--r--src/quick3d/imports/scene3d/importsscene3d.pro3
-rw-r--r--src/quick3d/quick3d/quick3d.pro3
-rw-r--r--src/quick3d/quick3dextras/quick3dextras.pro3
-rw-r--r--src/quick3d/quick3dinput/quick3dinput.pro3
-rw-r--r--src/quick3d/quick3drender/quick3drender.pro3
12 files changed, 36 insertions, 0 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro
index 9cd9a3ae6..8d472b149 100644
--- a/src/plugins/sceneparsers/assimp/assimp.pro
+++ b/src/plugins/sceneparsers/assimp/assimp.pro
@@ -3,6 +3,9 @@ QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
include(../../../3rdparty/assimp/assimp_dependency.pri)
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
HEADERS += \
assimphelpers.h \
assimpio.h
diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro
index 511ea0352..59039504e 100644
--- a/src/plugins/sceneparsers/gltf/gltf.pro
+++ b/src/plugins/sceneparsers/gltf/gltf.pro
@@ -1,6 +1,9 @@
TARGET = gltfsceneio
QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
HEADERS += \
gltfio.h
diff --git a/src/quick3d/imports/core/importscore.pro b/src/quick3d/imports/core/importscore.pro
index 5d325a9a4..6f43d8c99 100644
--- a/src/quick3d/imports/core/importscore.pro
+++ b/src/quick3d/imports/core/importscore.pro
@@ -5,6 +5,9 @@ IMPORT_VERSION = 2.0
QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
HEADERS += \
qt3dquick3dcoreplugin.h
diff --git a/src/quick3d/imports/extras/importsextras.pro b/src/quick3d/imports/extras/importsextras.pro
index d87fb3464..acc993fa7 100644
--- a/src/quick3d/imports/extras/importsextras.pro
+++ b/src/quick3d/imports/extras/importsextras.pro
@@ -5,6 +5,9 @@ IMPORT_VERSION = 2.0
QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras 3dlogic
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
HEADERS += \
qt3dquick3dextrasplugin.h
diff --git a/src/quick3d/imports/input/importsinput.pro b/src/quick3d/imports/input/importsinput.pro
index 69c687fdc..83a7797f9 100644
--- a/src/quick3d/imports/input/importsinput.pro
+++ b/src/quick3d/imports/input/importsinput.pro
@@ -5,6 +5,9 @@ IMPORT_VERSION = 2.0
QT += core-private qml 3dcore 3dinput 3dinput-private 3dquickinput-private
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
OTHER_FILES += qmldir
HEADERS += \
diff --git a/src/quick3d/imports/logic/importslogic.pro b/src/quick3d/imports/logic/importslogic.pro
index ae086afdc..c2b33f665 100644
--- a/src/quick3d/imports/logic/importslogic.pro
+++ b/src/quick3d/imports/logic/importslogic.pro
@@ -5,6 +5,9 @@ IMPORT_VERSION = 2.0
QT += core-private qml 3dcore 3dlogic
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
OTHER_FILES += qmldir
HEADERS += \
diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro
index 74ad1a516..442068fe7 100644
--- a/src/quick3d/imports/render/importsrender.pro
+++ b/src/quick3d/imports/render/importsrender.pro
@@ -5,6 +5,9 @@ IMPORT_VERSION = 2.0
QT += core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dquickrender-private
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
HEADERS += \
qt3dquick3drenderplugin.h
diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro
index 716723708..078d5e2a1 100644
--- a/src/quick3d/imports/scene3d/importsscene3d.pro
+++ b/src/quick3d/imports/scene3d/importsscene3d.pro
@@ -5,6 +5,9 @@ IMPORT_VERSION = 2.0
QT += qml quick 3dcore 3drender 3drender-private 3dinput
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
HEADERS += \
qtquickscene3dplugin.h \
scene3dlogging_p.h \
diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro
index 9e5ffbfdd..affb3b352 100644
--- a/src/quick3d/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d/quick3d.pro
@@ -3,6 +3,9 @@ MODULE = 3dquick
QT += core-private gui-private qml qml-private quick quick-private 3dcore 3dcore-private
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
gcov {
CONFIG += static
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3dextras/quick3dextras.pro b/src/quick3d/quick3dextras/quick3dextras.pro
index aa3b485e7..7af47424e 100644
--- a/src/quick3d/quick3dextras/quick3dextras.pro
+++ b/src/quick3d/quick3dextras/quick3dextras.pro
@@ -4,6 +4,9 @@ MODULE = 3dquickextras
QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3drender 3dlogic
CONFIG -= precompile_header
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
gcov {
CONFIG += static
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro
index 59339449e..3aa0dedcf 100644
--- a/src/quick3d/quick3dinput/quick3dinput.pro
+++ b/src/quick3d/quick3dinput/quick3dinput.pro
@@ -4,6 +4,9 @@ MODULE = 3dquickinput
QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3dcore-private 3dinput-private
CONFIG -= precompile_header
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
gcov {
CONFIG += static
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro
index f9d711dd6..959834870 100644
--- a/src/quick3d/quick3drender/quick3drender.pro
+++ b/src/quick3d/quick3drender/quick3drender.pro
@@ -4,6 +4,9 @@ MODULE = 3dquickrender
QT += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private
CONFIG -= precompile_header
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
gcov {
CONFIG += static
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage