diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 13:13:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 13:13:27 +0200 |
| commit | b45429fd7eeaf598d78f76a670a892c7d0d02f11 (patch) | |
| tree | 816c9404dd07db02cbe5b3b57b1b188d3ec52efd /.qmake.conf | |
| parent | 1eb9325292586c356b6beb6d9056dfc0c4c2e502 (diff) | |
| parent | 0f91218091da69a81eb3e3336d1bdbe572a21908 (diff) | |
| download | qtx11extras-b45429fd7eeaf598d78f76a670a892c7d0d02f11.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I5e403aafd4ef57dbbe813f1b7e62b49b18f77881
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 b1c22d3..d94a2e0 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,6 @@ load(qt_build_config) +CONFIG += warning_clean +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.9.0 |