From 3e3db25efc293a7fc543aa6d59899817b8e1411b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 21 Nov 2022 15:31:55 +0100 Subject: 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 --- src/plugins/geoservices/mapboxgl/qsgmapboxglnode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() +#if __has_include() #include #endif -- cgit v1.2.1