diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:11:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:11:56 +0200 |
| commit | 1ac4ee240214a0e36b504fa1bcbc0c716d50620f (patch) | |
| tree | 6a9c49da74804d61e158b4d3b421deadcaac5c40 /.qmake.conf | |
| parent | 42f8c197a9fedc891ff95f20e9ad166cfa47f592 (diff) | |
| parent | 2a143bf81b2ffb3bd7a5f47cf719e6ed347bf383 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Iee306971054f20f65447c9ac784b0137e060ef79
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 |