diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
commit | 9461103e4e88d652adbcd1790a21f087a1fccc53 (patch) | |
tree | 21c2df3684d2d6807344e480f9631871308049a6 /.qmake.conf | |
parent | 6f00d966b8f1f12e4c41cf0a3e189718d10fd43f (diff) | |
parent | b8845794b95376e8be39dbdafca2c85b5ec4c195 (diff) | |
download | qtscript-9461103e4e88d652adbcd1790a21f087a1fccc53.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I0a8e242e0c24a67fe60737674dc3a4ecf0936f3a
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 5d17bc1..1a22398 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs android|boot2qt: CONFIG -= headersclean MODULE_VERSION = 5.8.0 |