diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:13 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:51 +0200 |
| commit | 4dac45c9ee59ff6586d90d423654da91523ab679 (patch) | |
| tree | cd4a4adf2cbc9e77bf86d2d11e71ec66afdf3be4 /.qmake.conf | |
| parent | 078cd61751aeaa310d35a3d596a21a36004a1a0f (diff) | |
| parent | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 2 |
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) |