diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 13:34:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 13:34:50 (GMT) |
| commit | e875699fb4c25b23248aff09cb690a287640e67f (patch) | |
| tree | 92721b44691ddb02660042db52a1dda1d5fad94f /src/3rdparty/javascriptcore/JavaScriptCore/config.h | |
| parent | 504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03 (diff) | |
| parent | 799c350d0fe0a29c146c7a32a509b71ea6bb7f49 (diff) | |
| download | Qt-e875699fb4c25b23248aff09cb690a287640e67f.zip Qt-e875699fb4c25b23248aff09cb690a287640e67f.tar.gz Qt-e875699fb4c25b23248aff09cb690a287640e67f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add QWidget::update() test.
Add license headers
Import static contents tests from old manualtests
Fix Build Failure for Maemo 5 Debug Build
Add ability to read last mod.time for zip entry.
Avoid asserting when index passed to QZipReader::entryInfoAt is out of boundaries
Add isValid() method to QZipReader::FileInfo.
Add `QIODevice* device() const` public method to QZip classes.
Rebuild configure.exe (again enable QtDeclarative module by default)
Update src/3rdparty/javascriptcore and adapt src/script to the changes
Use index-based approach for iterating over JS array properties
QFSFileEngine reduce number of system calls
remove unneeded "permissions normalization" code from QFileInfoGatherer
remove unneeded code from QFileInfo
QFSFileEngine: Don't use owner's permissions for current user; calculate them instead
In QFSFileEngine::fileFlags call getPermissions() only if entry exists
move permissions calculation code to separate method
Assistant: Fix full text indexing.
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/config.h')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/config.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index 5e70265..d5fdfe9 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -25,26 +25,26 @@ #include <wtf/Platform.h> -#if !defined(JS_EXPORTDATA) -#if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC) +#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) #define JS_EXPORTDATA __declspec(dllexport) #else #define JS_EXPORTDATA __declspec(dllimport) #endif +#define JS_EXPORTCLASS JS_EXPORTDATA #else #define JS_EXPORTDATA -#endif +#define JS_EXPORTCLASS #endif -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) // If we don't define these, they get defined in windef.h. // We want to use std::min and std::max #define max max #define min min -#if !COMPILER(MSVC7) && !PLATFORM(WINCE) +#if !COMPILER(MSVC7) && !OS(WINCE) // We need to define this before the first #include of stdlib.h or it won't contain rand_s. #ifndef _CRT_RAND_S #define _CRT_RAND_S @@ -53,13 +53,12 @@ #endif -#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD) +#if OS(FREEBSD) || OS(OPENBSD) #define HAVE_PTHREAD_NP_H 1 #endif /* FIXME: if all platforms have these, do they really need #defines? */ #define HAVE_STDINT_H 1 -#define HAVE_STRING_H 1 #define WTF_CHANGES 1 @@ -76,3 +75,15 @@ #include <wtf/DisallowCType.h> #endif +#if PLATFORM(CHROMIUM) +#if !defined(WTF_USE_V8) +#define WTF_USE_V8 1 +#endif +#endif /* PLATFORM(CHROMIUM) */ + +#if !defined(WTF_USE_V8) +#define WTF_USE_V8 0 +#endif /* !defined(WTF_USE_V8) */ + +/* Using V8 implies not using JSC and vice versa */ +#define WTF_USE_JSC !WTF_USE_V8 |