summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-11-10 11:47:44 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-18 03:29:04 (GMT)
commit1b2bc6cfcf0fad719a856241797fe6bcacbad1dd (patch)
tree3e273a6793afb6cf13fa09529605ef648a427517 /src/3rdparty
parent17df98c711f4c5e43e598c5f262c3b19a6b071e6 (diff)
downloadQt-1b2bc6cfcf0fad719a856241797fe6bcacbad1dd.zip
Qt-1b2bc6cfcf0fad719a856241797fe6bcacbad1dd.tar.gz
Qt-1b2bc6cfcf0fad719a856241797fe6bcacbad1dd.tar.bz2
Re-apply change 945e079e60506e88435802d0a764c8b4121ad16f by Richard Moe Gustavsen
BT: JavaScriptCore makes applications crash on leopard JavaScriptCore checks the Mac OS version when building, and uses symbols only defined in i e.g.snow leopard when building on snow leopard. This means that if you build Qt on snow leopard and later move it to leopard, applications will crash looking for a missing symbol (pthread_setname_np in particular). In Qt, we garuantee that you can run your applications on 10.4 and up for Carbon, and 10.5 and up for Cocoa. So using compile time checks this way is not a proper soulution. Result: In Qt, never use symbols not defined on all supported OS versions, or at least implement run-time checks. Rev-By: Simon Hausmann Rev-By: Tor Arne Rev-By: MortenS (cherry picked from commit f5d8ef2f2345c979b16efe8cadf2c77d3dd5db10)
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index ddc287f..7bfde5b 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -560,7 +560,7 @@
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TIMEB_H 1
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE)
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE) && !PLATFORM(QT)
#define HAVE_MADV_FREE_REUSE 1
#define HAVE_MADV_FREE 1
#define HAVE_PTHREAD_SETNAME_NP 1