diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-25 16:12:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-25 16:12:11 +0200 |
| commit | c7cdf3aac7ef9571ce0c0cf25a2c8455c7604451 (patch) | |
| tree | ff17379a7643d47224a500714d825d561172a282 /mkspecs/features/qt_build_extra.prf | |
| parent | 3f64156e918a8cf5da1b68191a280f0daf3d954b (diff) | |
| parent | 1e6630b54ce9a005c2cffac4dac95641838e8231 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/mimetypes/qmimeprovider.cpp
src/corelib/mimetypes/qmimetype.cpp
Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872
Diffstat (limited to 'mkspecs/features/qt_build_extra.prf')
| -rw-r--r-- | mkspecs/features/qt_build_extra.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_build_extra.prf b/mkspecs/features/qt_build_extra.prf index 378f5bbd7c..abdd7bc2b2 100644 --- a/mkspecs/features/qt_build_extra.prf +++ b/mkspecs/features/qt_build_extra.prf @@ -13,7 +13,7 @@ equals(TEMPLATE, subdirs): return() # It's likely that these extra flags will be wrong for host builds, # and the bootstrapped tools usually don't need them anyway. -host_build:force_bootstrap: return() +host_build:cross_compile: return() # The headersclean check needs defines and includes even for # header-only modules. |