diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-05-11 11:14:02 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-14 16:02:28 +0000 |
| commit | afc5426d4a1b22df72e4cf5582c390d774768673 (patch) | |
| tree | 1098263e7a1429134ffd4fb02da58bc509215e96 /src | |
| parent | 8f680c83447d9986be2709cc796ade05788c2135 (diff) | |
Enable QT_NO_FOREACH for some libraries
The core, extras, input, logic and render libraries contain no
Q_FOREACH loops anymore. Enable QT_NO_FOREACH so it stays that
way.
Change-Id: Ie2fa6b7621cce2c89f76cf37d1511bf8c16c13ee
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core.pro | 3 | ||||
| -rw-r--r-- | src/extras/extras.pro | 3 | ||||
| -rw-r--r-- | src/input/input.pro | 3 | ||||
| -rw-r--r-- | src/logic/logic.pro | 3 | ||||
| -rw-r--r-- | src/render/render.pro | 3 |
5 files changed, 15 insertions, 0 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index 4c1fa368e..74aa56e95 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -3,6 +3,9 @@ MODULE = 3dcore QT = core-private gui-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/extras/extras.pro b/src/extras/extras.pro index 57ba35652..a7bbc7f66 100644 --- a/src/extras/extras.pro +++ b/src/extras/extras.pro @@ -4,6 +4,9 @@ QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dinput DEFINES += QT3DEXTRAS_LIBRARY +# Qt3D is free of Q_FOREACH - make sure it stays that way: +DEFINES += QT_NO_FOREACH + load(qt_module) include (geometries/geometries.pri) diff --git a/src/input/input.pro b/src/input/input.pro index 938e77643..73a571c9f 100644 --- a/src/input/input.pro +++ b/src/input/input.pro @@ -5,6 +5,9 @@ DEFINES += QT3DINPUT_LIBRARY MODULE = 3dinput MODULE_PLUGIN_TYPES = 3dinputdevices +# Qt3D is free of Q_FOREACH - make sure it stays that way: +DEFINES += QT_NO_FOREACH + QT += core-private 3dcore-private include(frontend/frontend.pri) diff --git a/src/logic/logic.pro b/src/logic/logic.pro index 4facdda3d..50ff01748 100644 --- a/src/logic/logic.pro +++ b/src/logic/logic.pro @@ -3,6 +3,9 @@ MODULE = 3dlogic QT = core-private gui-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/render/render.pro b/src/render/render.pro index 59d36f8c1..e60afc950 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -22,6 +22,9 @@ include (texture/texture.pri) RESOURCES += $$PWD/render.qrc +# 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 |