Created
February 27, 2014 15:00
-
-
Save torarnv/9251732 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit d2c662b0f51bbef57454529ce2d1eae01ff61431 | |
Author: Tor Arne Vestbø <tor.arne.vestbo@digia.com> | |
Date: Thu Feb 27 15:59:09 2014 +0100 | |
Don't pretend to be PLATFORM(IPHONE) or PLATFORM(IPHONE_SIMULATOR) for Qt | |
As that ends up triggering other code paths such as JIT on ARM. | |
Change-Id: I14238c0913bd60e07de5015a82bcde0ab08a3a19 | |
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 |
Author
torarnv
commented
Mar 12, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment