aboutsummaryrefslogtreecommitdiffstats
path: root/.qmake.conf
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-08-11 10:34:42 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-08-11 10:34:42 +0200
commitc472c2d1128962e12d0528ae6f9fa43cc6a7f147 (patch)
tree353b270ed4e60be6cf3881bdb396dd8038d02870 /.qmake.conf
parent82b64b8bec92212b90ee0987511179e14e1da071 (diff)
parent92c827a2a4b7e56dcb6865fa35fba25b5d2eb87f (diff)
Merge remote-tracking branch 'origin/dev' into wip/qt6
Diffstat (limited to '.qmake.conf')
-rw-r--r--.qmake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 1e82351b..f8fe8390 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,6 +1,7 @@
load(qt_build_config)
CONFIG += warning_clean
-DEFINES += QT_NO_FOREACH
+
+DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
QQC2_SOURCE_TREE = $$PWD