diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:09:09 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:09:25 +0200 |
commit | 5508cd19d17c2b2a94aef94be2b4dcdbb29377e8 (patch) | |
tree | 26d7f7878adab490d1fa0a40bbb7cbf8c9f84a6c /.qmake.conf | |
parent | d1cd4b3c43753f24d3729b22ac7aedd88dc42bd3 (diff) | |
parent | 7fe90b93e5f29dc2174e2050e31ee03e814be84c (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3439e998c2a86d7bf28becca3b5db174839fb825
Diffstat (limited to '.qmake.conf')
-rw-r--r-- | .qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index ab57ef1..a2a0d41 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.7.1 |