diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:35:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:35:30 +0200 |
| commit | 29cc2a47b9548e1002e981b43eec10fbf8af9790 (patch) | |
| tree | a81671a98d141c9b8ffc4770aaff574567cfbd21 /.qmake.conf | |
| parent | 414562f60b8b8aa7904fbc37475938d696a96829 (diff) | |
| parent | 55825068ab0e3102bf5f8843c0cccab1ff120ae1 (diff) | |
| download | qtsvg-29cc2a47b9548e1002e981b43eec10fbf8af9790.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
tests/auto/qicon_svg/qicon_svg.pro
Change-Id: I062ecbb9b092286c3ca7ec5deac3a0767329ba3f
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 0957f58..556f554 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs CONFIG += warning_clean MODULE_VERSION = 5.8.0 |