diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-19 09:40:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:09:39 +0200 |
| commit | 682ab87480e7757346802ce7f54cfdbdfeb2339e (patch) | |
| tree | 735679901fc2ce18eee0e1c68de317fa4bc33988 /Source/WTF/wtf | |
| parent | 5c7fb097b94502b3f31edf7ad4c454cc1d31852e (diff) | |
| download | qtwebkit-682ab87480e7757346802ce7f54cfdbdfeb2339e.tar.gz | |
Fix broken QtWebKit5.lib linking https://bugs.webkit.org/show_bug.cgi?id=88321
Patch by Joel Dillon <joel.dillon@codethink.co.uk> Jocelyn Turcotte <jocelyn.turcotte@nokia.com> on 2012-06-19
Reviewed by NOBODY (OOPS!).
Source/JavaScriptCore:
Also update the Wx build to use the new define.
* API/JSBase.h:
* runtime/JSExportMacros.h:
* wscript:
Source/WebCore:
* platform/PlatformExportMacros.h:
Source/WTF:
Instead of letting a module's headers know which other modules depend on them,
have depending modules define explicitely that they want its symbols exported too.
JavaScriptCore should then be compiled with both BUILDING_JavaScriptCore and
STATICALLY_LINKED_WITH_WTF.
* wtf/ExportMacros.h:
Tools:
On windows the import/export definition is part of the symbol's signature.
Define STATICALLY_LINKED_WITH_$$library for each dependend module
that is being linked statically to make sure that they can be linked together
later on.
Also do not compile Assertions.cpp in DumpRenderTree anymore since all the
used symbols are exported and it would cause a duplicate symbols error.
* DumpRenderTree/qt/DumpRenderTree.pro:
* qmake/mkspecs/features/default_post.prf:
Diffstat (limited to 'Source/WTF/wtf')
| -rw-r--r-- | Source/WTF/wtf/ExportMacros.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WTF/wtf/ExportMacros.h b/Source/WTF/wtf/ExportMacros.h index efa0c8f81..d50d6d117 100644 --- a/Source/WTF/wtf/ExportMacros.h +++ b/Source/WTF/wtf/ExportMacros.h @@ -72,7 +72,7 @@ // FIXME: When all ports are using the export macros, we should replace // WTF_EXPORTDATA with WTF_EXPORT_PRIVATE macros. -#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) #define WTF_EXPORTDATA WTF_EXPORT #else #define WTF_EXPORTDATA WTF_IMPORT @@ -81,7 +81,7 @@ #else // !USE(EXPORT_MACROS) #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC) -#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) #define WTF_EXPORTDATA __declspec(dllexport) #else #define WTF_EXPORTDATA __declspec(dllimport) @@ -98,7 +98,7 @@ #endif // USE(EXPORT_MACROS) -#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) #define WTF_EXPORT_PRIVATE WTF_EXPORT #else #define WTF_EXPORT_PRIVATE WTF_IMPORT |