diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:36:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:36:02 +0200 |
commit | 3c6d1f97c0b17f572ae569ad56360cca68fe23cb (patch) | |
tree | 2068ad834d830b03d875027fbe8f845341a9d9ac /.qmake.conf | |
parent | 9f8b2a6eb3930c52d414a7e84ca7d4600a9a47d0 (diff) | |
parent | 8bd0a0e5215227c5e56966fead0987e306eaccb8 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: Ia3e6cc1426587473c7079c0b20e76cfbd31cfeea
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 |