diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:03:02 +0100 |
| commit | 508514b50737c8b854f1b8932a933ef1a24debbc (patch) | |
| tree | 7a7d9c206acc75df9e4d342214cade0d7d19d6b9 /.qmake.conf | |
| parent | 5c0e357028e378664190fc5e5ca0091e76b9cde7 (diff) | |
| parent | 033eeff87015f6ffa1e6a73dcc6c8a20479511e4 (diff) | |
| download | qtscript-508514b50737c8b854f1b8932a933ef1a24debbc.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I6c9ecff3a336c5183aa631e7ce600e99f9594dd5
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 fe75edc..757ebf5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,6 @@ load(qt_build_config) android|boot2qt: CONFIG -= headersclean +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.9.0 |