diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
| commit | 43c0bfb2af436f6b27cdccb156ecac1d1f3711dc (patch) | |
| tree | 4767c7bd4e78baf68961c474aed727a949f86b74 /.qmake.conf | |
| parent | e91b9713cc956770a38c1ba4db996c24612c4fa4 (diff) | |
| parent | 2523056490c3f7a35d176deb583ba46899fe260b (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I709c31705a7edc722039caa4b1c57a0627bde8b9
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 7a38999d..27b205b7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.8.0 |