diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:26:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:26:33 +0200 |
| commit | 3d975119f95173ce7ed2a29277cf1aa575bc31ad (patch) | |
| tree | 92f8c22042ec004d8f2f40fca2cd4031e5699cb3 /.qmake.conf | |
| parent | f4ab6555e4f0db7dde3bc52feea0a5b13c29415c (diff) | |
| parent | 57b5739923a741aa4317c11c5e86c911cc25f798 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I7a5a180e1da90479d25ec320448109072ac43e8f
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 b1c22d3..092f7d7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,5 @@ load(qt_build_config) +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.9.0 |