summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2022-11-21 15:31:55 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2022-11-22 11:00:47 +0000
commit3e3db25efc293a7fc543aa6d59899817b8e1411b (patch)
treeb59542450ce27811d6d6bd73f487a02aec7299cc
parent13112717ee0a49620f51078c1b8d69109e568498 (diff)
downloadqtlocation-3e3db25efc293a7fc543aa6d59899817b8e1411b.tar.gz
Replace QT_HAS_INCLUDE() wrapper macro with __has_include()
Using wrappers for these macros is problematic when for example passing the -frewrite-includes flag to preprocess sources before shipping off to distcc or Icecream. It will also start producing warnings when compilers implement http://eel.is/c++draft/cpp.cond#7.sentence-2. See for example https://reviews.llvm.org/D49091 See qtbase change c3bd5ffdc8a3b459f18ba6e35fca93e29f3b0ab0. Change-Id: Ib3b39c2f47816b8a92ffcc0432322cb0d1ea7dbf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/plugins/geoservices/mapboxgl/qsgmapboxglnode.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.cpp b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.cpp
index ed4b1e41..26ebf078 100644
--- a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.cpp
+++ b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.cpp
@@ -41,7 +41,7 @@
#include "qsgmapboxglnode.h"
#include "qgeomapmapboxgl.h"
-#if QT_HAS_INCLUDE(<QtQuick/private/qsgplaintexture_p.h>)
+#if __has_include(<QtQuick/private/qsgplaintexture_p.h>)
#include <QtQuick/private/qsgplaintexture_p.h>
#endif