summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2011-03-04 13:11:53 (GMT)
committercon <qtc-committer@nokia.com>2011-03-10 11:58:13 (GMT)
commitbf1eb9a98bedae2c1b261ed4d7d92d4a1dbe28e3 (patch)
treef9be1a4ba92564c4234ae44d092393cbe779ffff
parent1e2410b5e486344d86cf02888a978fcda94fe02a (diff)
downloadQt-bf1eb9a98bedae2c1b261ed4d7d92d4a1dbe28e3.zip
Qt-bf1eb9a98bedae2c1b261ed4d7d92d4a1dbe28e3.tar.gz
Qt-bf1eb9a98bedae2c1b261ed4d7d92d4a1dbe28e3.tar.bz2
Build JavaScriptCore also under unusual platform combination.
Reviewed-by: Jedrzej Nowacki Reviewed-by: Simon Hausmann
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index 5abe9a1..cb4a963 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -635,6 +635,9 @@
#define ENABLE_REPAINT_THROTTLING 1
#define HAVE_READLINE 1
#define WTF_PLATFORM_CF 1
+#endif
+
+#if OS(IPHONE_OS) && !PLATFORM(QT)
#define WTF_USE_PTHREADS 1
#define HAVE_PTHREAD_RWLOCK 1
#endif