diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:47:36 +0100 |
| commit | 9a492e0f47660b4a428fc1fc6dc0fd07b2b3b1b7 (patch) | |
| tree | 32ec2295ed55123f6ce80b52278cf3baa24aae4c /.qmake.conf | |
| parent | 00c6b792a95d72a4deb2bb89d0ba8cbb52681998 (diff) | |
| parent | b77af012b1e40e3531838652ea4114b77327bbd2 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1
Conflicts:
.qmake.conf
Change-Id: I59c9a70eba366693053bb684b374cff02650ace0
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf index 8359d9e..d2d37ca 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,7 @@ load(qt_build_config) +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.9.0 + CMAKE_MODULE_TESTS=- |