summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-07-08 12:32:29 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-07-08 13:20:48 +0200
commit3622ebaac51abd2e4d1541120ae3b6e42932359f (patch)
tree580aa25716bfc88d57f15ad68f7bfa727aebc400 /.qmake.conf
parentf955bd8ced8b93d142b7f755665946424c6d3644 (diff)
parentc39910993eaf6a7d68fbbe366d990f3f972533ca (diff)
Merge remote-tracking branch 'origin/dev' into wip/qt6
Diffstat (limited to '.qmake.conf')
-rw-r--r--.qmake.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 1d049940d8..de7af300dc 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,6 +1,8 @@
load(qt_build_config)
CONFIG += warning_clean
+DEFINES += QT_NO_JAVA_STYLE_ITERATORS
+
QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD)