summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-12-11 22:18:32 (GMT)
committerThiago Macieira <thiago.macieira@intel.com>2017-12-13 20:07:30 (GMT)
commit936d9ab1761dec5f345eb32793b655e4620d3ac2 (patch)
tree32698d1b5a26c11a09e9815f24d2dc5c7cf458fa
parentb2e0a242a8c77d8cff186ef25b8360927c955941 (diff)
downloadqtlocation-936d9ab1761dec5f345eb32793b655e4620d3ac2.tar.gz
Disable Mapbox-GL with the Intel compiler
The MBGL code uses C++ Standard Library functionality that does not compile with ICC. Or with QNX. Or MSVC. So, great job in the Standard Library being cross-platform. When using gcc 6 headers: /usr/include/c++/6/experimental/optional(720): error: more than one instance of overloaded function "__constexpr_addressof" matches the argument list: [...] detected during instantiation of "const _Tp *std::experimental::fundamentals_v1::optional<_Tp>::operator->() const [with _Tp=std::string]" at line 47 of "platform/qt/src/http_request.cpp" When using gcc 7 headers: /usr/include/c++/7/ext/new_allocator.h(136): error: function "std::pair<_T1, _T2>::pair(const std::pair<_T1, _T2> &) [with _T1=const std::string, _T2=mbgl::gl::VertexArray]" (declared at line 292 of "/usr/include/c++/7/bits/stl_pair.h") cannot be referenced -- it is a deleted function Change-Id: I9741f017961b410c910dfffd14ff5d8b5f5120d3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
-rw-r--r--src/location/configure.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/configure.json b/src/location/configure.json
index 4de6e86..bfa3d6f 100644
--- a/src/location/configure.json
+++ b/src/location/configure.json
@@ -37,7 +37,7 @@
"condition": [
"features.opengl",
"features.c++14",
- "!config.qnx && (!config.win32 || config.mingw)"
+ "!config.qnx && !config.intel_icc && (!config.win32 || config.mingw)"
],
"output": [ "privateFeature" ]
},