diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-03-18 10:25:05 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-03-18 13:30:35 (GMT) |
| commit | 109efebab1420270d824fd419bf0b2f2cb9d01b9 (patch) | |
| tree | 19610d274d1da59e5f436eaa90f32d48a3a57161 /src/3rdparty/javascriptcore | |
| parent | a6b28b13331117c6beec96ddcdcd727550d77343 (diff) | |
| download | Qt-109efebab1420270d824fd419bf0b2f2cb9d01b9.zip Qt-109efebab1420270d824fd419bf0b2f2cb9d01b9.tar.gz Qt-109efebab1420270d824fd419bf0b2f2cb9d01b9.tar.bz2 | |
Fix JSC export macros
If we're building QtScript, we want the JS_EXPORTDATA and
JS_EXPORTCLASS to expand to nothing.
This avoids the macros being redefined (incorrectly) on MSVC.
Diffstat (limited to 'src/3rdparty/javascriptcore')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index d5fdfe9..2af2e71 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -25,7 +25,7 @@ #include <wtf/Platform.h> -#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) +#if !defined(QT_BUILD_SCRIPT_LIB) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) #define JS_EXPORTDATA __declspec(dllexport) #else |