From b2586ea54a8ae13169908e3dc8a85d21e0eb2f14 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 14 Oct 2016 08:09:31 -0700 Subject: Use correct QT_*_PLATFORM_SDK_EQUAL_OR_ABOVE macros QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE and QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE are deprecated in favor of QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE and QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE, respectively. Change-Id: Ie09d2b8eadb761bfb6477bfd60c11aad1d0da800 Reviewed-by: Alexandru Croitor --- src/webview/qwebview_darwin.mm | 4 ++-- src/webview/qwebview_osx.mm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/webview/qwebview_darwin.mm b/src/webview/qwebview_darwin.mm index 1ff0902..24587aa 100644 --- a/src/webview/qwebview_darwin.mm +++ b/src/webview/qwebview_darwin.mm @@ -84,7 +84,7 @@ inline QSysInfo::MacVersion qt_OS_limit(QSysInfo::MacVersion osxVersion, QWebViewPrivate *QWebViewPrivate::create(QWebView *q) { -#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10, __IPHONE_8_0) +#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10, __IPHONE_8_0) if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_10, QSysInfo::MV_IOS_8_0) && QtWebViewPrivate::useNativeWebView()) return new QDarwinWebViewPrivate(q); @@ -152,7 +152,7 @@ static inline CGRect toCGRect(const QRectF &rect) // ------------------------------------------------------------------------- -#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10, __IPHONE_8_0) +#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10, __IPHONE_8_0) class QWebViewInterface; diff --git a/src/webview/qwebview_osx.mm b/src/webview/qwebview_osx.mm index 711f62f..e64ad06 100644 --- a/src/webview/qwebview_osx.mm +++ b/src/webview/qwebview_osx.mm @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QOsxWebViewPrivate; -#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11) +#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11) #define QtFrameLoadDelegateProtocol #else // WebFrameLoadDelegate is an informal protocol in <= 10.10 SDK. -- cgit v1.2.3