diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-11-21 15:33:11 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-11-22 15:14:21 +0000 |
| commit | 9f9f4f8573fa5a654e1237f9704694c7ac8c0c03 (patch) | |
| tree | 527f00fe982ce518bea60bd096a55627390f3880 /src | |
| parent | 298b434cd0f5d0b7801b830235cbd6b051e9a4d7 (diff) | |
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: I91e5cbd0edaebff1893e2ad068bb8dbe8063201b
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/multimedia/darwin/avfvideosink.mm | 4 | ||||
| -rw-r--r-- | src/plugins/multimedia/darwin/common/avfmetadata.mm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/multimedia/darwin/avfvideosink.mm b/src/plugins/multimedia/darwin/avfvideosink.mm index d51315e23..0360039f1 100644 --- a/src/plugins/multimedia/darwin/avfvideosink.mm +++ b/src/plugins/multimedia/darwin/avfvideosink.mm @@ -11,11 +11,11 @@ #include <AVFoundation/AVFoundation.h> #import <QuartzCore/CATransaction.h> -#if QT_HAS_INCLUDE(<AppKit/AppKit.h>) +#if __has_include(<AppKit/AppKit.h>) #include <AppKit/AppKit.h> #endif -#if QT_HAS_INCLUDE(<UIKit/UIKit.h>) +#if __has_include(<UIKit/UIKit.h>) #include <UIKit/UIKit.h> #endif diff --git a/src/plugins/multimedia/darwin/common/avfmetadata.mm b/src/plugins/multimedia/darwin/common/avfmetadata.mm index 328f9c367..e3c536416 100644 --- a/src/plugins/multimedia/darwin/common/avfmetadata.mm +++ b/src/plugins/multimedia/darwin/common/avfmetadata.mm @@ -13,7 +13,7 @@ #include <QImage> #include <QtMultimedia/qvideoframe.h> -#if QT_HAS_INCLUDE(<AppKit/AppKit.h>) +#if __has_include(<AppKit/AppKit.h>) #include <AppKit/AppKit.h> #endif |