diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-02-27 15:59:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-27 16:03:02 +0100 |
| commit | bfd4c7ae5704af56d7188c35dfe0fa311874a770 (patch) | |
| tree | 957f344d12766188c729c3c7ef29af9d0ef39971 | |
| parent | b95d7d3425283d7556bbfa0322c0c5f9529905d8 (diff) | |
| download | qtscript-bfd4c7ae5704af56d7188c35dfe0fa311874a770.tar.gz | |
Don't pretend to be PLATFORM(IPHONE) or PLATFORM(IPHONE_SIMULATOR)
As that ends up triggering other code paths such as JIT on ARM.
Change-Id: I14238c0913bd60e07de5015a82bcde0ab08a3a19
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index 3d6d271..0b95639 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -509,6 +509,7 @@ #define WTF_PLATFORM_WIN 1 #endif +#if !PLATFORM(QT) /* PLATFORM(IPHONE) */ /* FIXME: this is sometimes used as an OS switch and sometimes for higher-level things */ #if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) @@ -526,6 +527,7 @@ #if !defined(WTF_PLATFORM_IPHONE) #define WTF_PLATFORM_IPHONE 0 #endif +#endif /* PLATFORM(ANDROID) */ /* FIXME: this is sometimes used as an OS() switch, and other times to drive |