From 3fe6a74576f8c0c4e04343e0db94364f76fea407 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 14 Mar 2013 13:24:32 +1100 Subject: WebKit: Fix using macro to determine Mac user agent architecture Using || operator with #ifdef is incorrect. As a result, the architecture for the user agent is incorrectly set to PPC on an Intel Mac. This is a partial backport of r128775 in WebKit upstream. Task-number: QTBUG-30187 Change-Id: I6842f113fd024ababaf67e76dfee8f93e0988d08 Reviewed-by: Jocelyn Turcotte --- src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp index 21e04ce..078fe15 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp @@ -3800,7 +3800,7 @@ QString QWebPage::userAgentForUrl(const QUrl&) const #elif defined Q_OS_WIN32 firstPartTemp += windowsVersionForUAString(); #elif defined Q_OS_DARWIN -#ifdef __i386__ || __x86_64__ +#if CPU(X86) || CPU(X86_64) firstPartTemp += QString::fromLatin1("Intel Mac OS X"); #else firstPartTemp += QString::fromLatin1("PPC Mac OS X"); -- cgit v0.12