diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-22 09:38:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-22 09:38:11 +0200 |
commit | d80f57f60f39bb98948e22e94036104ddabd5e2b (patch) | |
tree | b2b9fd477e6e38ba3c8e4951752bb9083647efdc | |
parent | 09674580bb1c2225678db5d22a1c092a86aaa75d (diff) | |
parent | 7ebf02ea3e8e91b13eb2d34847c005d8a487e9da (diff) | |
download | qtscript-d80f57f60f39bb98948e22e94036104ddabd5e2b.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Iabc282a0396f2403a7a89712be279dd8e894df41
-rw-r--r-- | .qmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf index 33a2710..178aac1 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,5 @@ load(qt_build_config) CONFIG += qt_example_installs +android|boot2qt: CONFIG -= headersclean MODULE_VERSION = 5.7.0 |