diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
commit | b8845794b95376e8be39dbdafca2c85b5ec4c195 (patch) | |
tree | 26fa9590cc3efdfc1570e84c84182ab5545633ef /.qmake.conf | |
parent | 6e1dde1568d5b0dd774173e3d8f63a15c9a10e15 (diff) | |
parent | 9dc78a2d847bca5ec7b1445356523383a030d7ce (diff) | |
download | qtscript-b8845794b95376e8be39dbdafca2c85b5ec4c195.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
One side narrowed a QNX define to Dinkum; the other wanted the same
kludges applied for Intel. Combine their changes to the condition.
Change-Id: Id44102e53a0f96b7318437fb47fa76d8bc1119f3
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 178aac1..cf64169 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.7.0 |