From f9c847762a0470753caac0399ba5603d62af2b73 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 20 Apr 2012 20:34:22 +0200 Subject: fix webkit linking --- src/qt-1-cherrypicks.patch | 357 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 336 insertions(+), 21 deletions(-) diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index 26e7a60..4b20a9b 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -8,7 +8,7 @@ Also contains MXE specific fixes. From 16a4f14e8e879a14ae5db47d0731c9199c01a816 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 13 Jan 2012 00:17:48 +0100 -Subject: [PATCH 01/17] remove trailing whitespace +Subject: [PATCH 01/19] remove trailing whitespace backported from qt5/qtbase Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6 @@ -38,7 +38,7 @@ index 6bc2fa6..9b7967d 100644 From 162708efc51e40ed59d4e3397d399920c21d03a6 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 30 Jun 2011 10:22:33 +0200 -Subject: [PATCH 02/17] do not detect or configure iconv for Windows +Subject: [PATCH 02/19] do not detect or configure iconv for Windows Qt doesn't use iconv on Windows, but configuring it will appear to work and the build will complete. The result is that character @@ -75,7 +75,7 @@ index a706908..0690822 100755 From dd34e052a555203b2bfb415bd0ce348ef232aa7e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 18 Jan 2012 11:43:10 +0100 -Subject: [PATCH 03/17] fix whitespace +Subject: [PATCH 03/19] fix whitespace backported from qt5/qtbase Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f @@ -152,7 +152,7 @@ index 9b7967d..836cc34 100644 From 7f2e5f5e4bc740446f0160ae3246907fa4f6dc2f Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 4 Jul 2011 00:42:24 +0200 -Subject: [PATCH 04/17] build and load text codecs regardless of iconv and +Subject: [PATCH 04/19] build and load text codecs regardless of iconv and platform Otherwise applications linking to static Qt may have to import @@ -298,7 +298,7 @@ index 74e5e90..2b3100a 100644 From 00db0d7b9b99b18fd08463f86102f1b63eb3a527 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 13 Jan 2012 00:24:13 +0100 -Subject: [PATCH 05/17] move plugin text codecs to QtCore +Subject: [PATCH 05/19] move plugin text codecs to QtCore Having plugin text codecs adds considerable complexity to configuring Qt. The plugin interface is designed for optional @@ -79340,7 +79340,7 @@ index 94ce675..c4af49b 100644 From 0332650cdfb4c5847a4678a1aebfbe146c850b87 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 18 Jan 2012 21:01:26 +0100 -Subject: [PATCH 06/17] update private header references +Subject: [PATCH 06/19] update private header references backported from qt5/qtbase Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6 @@ -79516,7 +79516,7 @@ index c56a103..df1449b 100644 From e76298384079852d9cc1e0138a10b0637f34687f Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 3 Jul 2011 21:53:27 +0200 -Subject: [PATCH 07/17] cosmetic adjustments for files moved to core/codecs +Subject: [PATCH 07/19] cosmetic adjustments for files moved to core/codecs -update old reference to 'plugin' -rename multiple inclusion guards @@ -80027,7 +80027,7 @@ index df1449b..f8efcae 100644 From 16ea320980842c9c16d380f3bdd84c5a413dbd21 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 12 Jan 2012 10:43:29 +0100 -Subject: [PATCH 08/17] remove obsolete codec plugin loading code +Subject: [PATCH 08/19] remove obsolete codec plugin loading code backported from qt5/qtbase Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d @@ -80577,7 +80577,7 @@ index 844101a..4ea4227 100644 From 5a5ae1066dbcf8a663e7f292d8679aae2ccd7b73 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 23 Jan 2012 23:12:46 +0100 -Subject: [PATCH 09/17] remove vestiges of text codec plugins +Subject: [PATCH 09/19] remove vestiges of text codec plugins follow-up to 3a3356a85079d734dfa57205a00e1996afc033df @@ -80614,7 +80614,7 @@ index dea05e0..12cd8ea 100644 From 90daa3f753c91a3efde3dfdc9151f9a639c653d0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 3 Nov 2011 15:10:26 +0100 -Subject: [PATCH 10/17] use pkg-config for libmng (MXE specific) +Subject: [PATCH 10/19] use pkg-config for libmng (MXE specific) Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4 --- @@ -80643,7 +80643,7 @@ index ffb98de..6aab68f 100644 From 1d4c3643de6eea011e74ed73dc2290c58f41d865 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 11/17] use pkg-config for libtiff-4 (MXE specific) +Subject: [PATCH 11/19] use pkg-config for libtiff-4 (MXE specific) Change-Id: I5e89e66fc1606d425553e781c9e62db703136957 --- @@ -80672,7 +80672,7 @@ index e1cc3ee..71cbab1 100644 From 53435e54b4d81bdcd35ccbe292ba6cc9321e8b17 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 5 Jun 2010 23:41:04 +0200 -Subject: [PATCH 12/17] restore support for static linking of QtWebKit (MXE +Subject: [PATCH 12/19] restore support for static linking of QtWebKit (MXE specific) Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. @@ -80768,7 +80768,7 @@ index 9be0f4a..6744f58 100644 From f6375f66b90b8f03c2df62330bd1c14e16a0120e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 1 Sep 2011 13:47:10 +0200 -Subject: [PATCH 13/17] fix building on GNU/kFreeBSD (MXE specific) +Subject: [PATCH 13/19] fix building on GNU/kFreeBSD (MXE specific) This patch has been taken from: @@ -80802,7 +80802,7 @@ index ed8f9eb..e571c4e 100644 From 90fc0213a853e155514e49765794ebbe9ef3da1f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 1 Sep 2011 13:49:47 +0200 -Subject: [PATCH 14/17] fix missing platform when building on GNU/kFreeBSD +Subject: [PATCH 14/19] fix missing platform when building on GNU/kFreeBSD (MXE specific) This patch is inspired by: @@ -80836,7 +80836,7 @@ index 2837eec..8b4e5e8 100755 From 3c0837566e8319fddae6c6f5a037657e729f9d43 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 1 Sep 2011 13:51:50 +0200 -Subject: [PATCH 15/17] fix building on dragonfly (MXE specific) +Subject: [PATCH 15/19] fix building on dragonfly (MXE specific) This patch is inspired by: http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup @@ -80866,7 +80866,7 @@ index 8b4e5e8..99948d1 100755 From b80860ba8ddb8c418fc4fb356bc1bc6a93274a4a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 23 Mar 2012 16:29:57 +0100 -Subject: [PATCH 16/17] gcc 4.7.0 compatibility fix for javascript +Subject: [PATCH 16/19] gcc 4.7.0 compatibility fix for javascript taken from http://qt-project.org/forums/viewthread/15071 @@ -80906,23 +80906,26 @@ index 2542878..3cb66a0 100644 1.7.9.2 -From eed49bb64c768d9a51fb55567052b2e3441ef70e Mon Sep 17 00:00:00 2001 +From 7caeea0f6d339843f304de021ba176b64c8ac6b7 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 19 Apr 2012 14:48:34 +0200 -Subject: [PATCH 17/17] fix static library names when generating .pc files for +Subject: [PATCH 17/19] fix static library names when generating .pc files for pkgconfig -219a688ac17052e4bb3aac9ff8a813e3f4d8da01 added the version extension +c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension which only occurs on the DLL import library. -taken from https://codereview.qt-project.org/23844 +cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61 Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe +Reviewed-by: Mark Brand +Reviewed-by: Girish Ramakrishnan +(cherry picked from commit 51a2b0fde9bf635482fd2463b901139c82ed0dc4) --- qmake/generators/makefile.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 66c6d49..951f40d 100644 +index 66c6d49..447943a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3258,7 +3258,8 @@ MakefileGenerator::writePkgConfigFile() @@ -80938,3 +80941,315 @@ index 66c6d49..951f40d 100644 -- 1.7.9.2 + +From be64a42dd801dd1ae40199fd70762316eba627d6 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Fri, 20 Apr 2012 15:55:56 +0200 +Subject: [PATCH 18/19] fix linking to static webkit + +Change-Id: I9e39b1c648aa7bb9c28b0cb4307bffc302b11e6b +--- + src/3rdparty/webkit/Source/WebCore/WebCore.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pro b/src/3rdparty/webkit/Source/WebCore/WebCore.pro +index ceceee8..6609944 100644 +--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pro ++++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pro +@@ -16,7 +16,7 @@ CONFIG += staticlib + DESTDIR = $$WEBCORE_DESTDIR + + DEFINES += BUILDING_WEBKIT +-DEFINES += QT_MAKEDLL ++!static:DEFINES += QT_MAKEDLL + + contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) { + DEFINES += ENABLE_NO_LISTBOX_RENDERING=1 +-- +1.7.9.2 + + +From 5d8b293a6ee7bf87c588e80ec4a336017e09ff0f Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Fri, 20 Apr 2012 17:19:53 +0200 +Subject: [PATCH 19/19] remove the declspec for static linking (mxe specific) + +Change-Id: I1ed88a85556b5f0d5a12b2fa14f0f5cc12a374f3 +--- + .../webkit/Source/JavaScriptCore/API/JSBase.h | 4 ++-- + src/3rdparty/webkit/Source/JavaScriptCore/config.h | 4 ++-- + .../JavaScriptCore/jit/ExecutableAllocator.h | 2 +- + .../Source/JavaScriptCore/wtf/ExportMacros.h | 4 ++-- + .../ThirdParty/ANGLE/include/KHR/khrplatform.h | 2 +- + .../gtest/include/gtest/internal/gtest-port.h | 4 ++-- + src/3rdparty/webkit/Source/WebCore/config.h | 8 ++++---- + .../WebCore/platform/graphics/win/QTCFDictionary.h | 4 ++-- + .../platform/graphics/win/QTDecompressionSession.h | 4 ++-- + .../Source/WebCore/platform/graphics/win/QTMovie.h | 4 ++-- + .../WebCore/platform/graphics/win/QTMovieGWorld.h | 4 ++-- + .../WebCore/platform/graphics/win/QTMovieTask.h | 4 ++-- + .../platform/graphics/win/QTMovieVisualContext.h | 4 ++-- + .../WebCore/platform/graphics/win/QTPixelBuffer.h | 4 ++-- + .../Source/WebCore/platform/graphics/win/QTTrack.h | 4 ++-- + .../webkit/Source/WebKit2/Shared/API/c/WKBase.h | 4 ++-- + 16 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/API/JSBase.h b/src/3rdparty/webkit/Source/JavaScriptCore/API/JSBase.h +index fed54fe..bce6aab 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/API/JSBase.h ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/API/JSBase.h +@@ -72,9 +72,9 @@ typedef struct OpaqueJSValue* JSObjectRef; + #define JS_EXPORT __attribute__((visibility("default"))) + #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__) + #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) +-#define JS_EXPORT __declspec(dllexport) ++#define JS_EXPORT + #else +-#define JS_EXPORT __declspec(dllimport) ++#define JS_EXPORT + #endif + #else /* !defined(JS_NO_EXPORT) */ + #define JS_EXPORT +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/config.h b/src/3rdparty/webkit/Source/JavaScriptCore/config.h +index 394bba5..b9b4a58 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/config.h ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/config.h +@@ -49,9 +49,9 @@ + + #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) + #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) +-#define JS_EXPORTDATA __declspec(dllexport) ++#define JS_EXPORTDATA + #else +-#define JS_EXPORTDATA __declspec(dllimport) ++#define JS_EXPORTDATA + #endif + #define JS_EXPORTCLASS JS_EXPORTDATA + #else +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h b/src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h +index 77a2567..ba1e36e 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h +@@ -57,7 +57,7 @@ + #if OS(WINCE) + // From pkfuncs.h (private header file from the Platform Builder) + #define CACHE_SYNC_ALL 0x07F +-extern "C" __declspec(dllimport) void CacheRangeFlush(LPVOID pAddr, DWORD dwLength, DWORD dwFlags); ++extern "C" void CacheRangeFlush(LPVOID pAddr, DWORD dwLength, DWORD dwFlags); + #endif + + #if PLATFORM(BREWMP) +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ExportMacros.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ExportMacros.h +index 3fadd37..6993163 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ExportMacros.h ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ExportMacros.h +@@ -33,8 +33,8 @@ + #include "Platform.h" + + #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC) +-#define WTF_EXPORT __declspec(dllexport) +-#define WTF_IMPORT __declspec(dllimport) ++#define WTF_EXPORT ++#define WTF_IMPORT + #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) + #define WTF_EXPORT __attribute__((visibility("default"))) + #define WTF_IMPORT WTF_EXPORT +diff --git a/src/3rdparty/webkit/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/src/3rdparty/webkit/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h +index 8ec0d19..61d5500 100644 +--- a/src/3rdparty/webkit/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h ++++ b/src/3rdparty/webkit/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h +@@ -98,7 +98,7 @@ + * This precedes the return type of the function in the function prototype. + */ + #if defined(_WIN32) && !defined(__SCITECH_SNAP__) +-# define KHRONOS_APICALL __declspec(dllimport) ++# define KHRONOS_APICALL + #elif defined (__SYMBIAN32__) + # define KHRONOS_APICALL IMPORT_C + #else +diff --git a/src/3rdparty/webkit/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h b/src/3rdparty/webkit/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h +index a2a62be..f44b8c9 100644 +--- a/src/3rdparty/webkit/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h ++++ b/src/3rdparty/webkit/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h +@@ -590,9 +590,9 @@ + #ifdef _MSC_VER + + #if GTEST_LINKED_AS_SHARED_LIBRARY +-#define GTEST_API_ __declspec(dllimport) ++#define GTEST_API_ + #elif GTEST_CREATE_SHARED_LIBRARY +-#define GTEST_API_ __declspec(dllexport) ++#define GTEST_API_ + #endif + + #endif // _MSC_VER +diff --git a/src/3rdparty/webkit/Source/WebCore/config.h b/src/3rdparty/webkit/Source/WebCore/config.h +index a7ddcee..e4dc291 100644 +--- a/src/3rdparty/webkit/Source/WebCore/config.h ++++ b/src/3rdparty/webkit/Source/WebCore/config.h +@@ -55,14 +55,14 @@ + + #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) + #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) +-#define JS_EXPORTDATA __declspec(dllexport) ++#define JS_EXPORTDATA + #else +-#define JS_EXPORTDATA __declspec(dllimport) ++#define JS_EXPORTDATA + #endif + #if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) +-#define WEBKIT_EXPORTDATA __declspec(dllexport) ++#define WEBKIT_EXPORTDATA + #else +-#define WEBKIT_EXPORTDATA __declspec(dllimport) ++#define WEBKIT_EXPORTDATA + #endif + #define WTF_EXPORT_PRIVATE + #define JS_EXPORT_PRIVATE +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTCFDictionary.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTCFDictionary.h +index ff34328..3ac609c 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTCFDictionary.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTCFDictionary.h +@@ -27,9 +27,9 @@ + #define QTCFDictionary_h + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + #include +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTDecompressionSession.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTDecompressionSession.h +index 67b6635..74963ee 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTDecompressionSession.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTDecompressionSession.h +@@ -27,9 +27,9 @@ + #define QTDecompressionSession_h + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + #include "QTPixelBuffer.h" +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovie.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovie.h +index 38b3473..7d9d7e1 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovie.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovie.h +@@ -30,9 +30,9 @@ + #include + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + class QTMovie; +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieGWorld.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieGWorld.h +index 495fe25..a85f2e2 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieGWorld.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieGWorld.h +@@ -34,9 +34,9 @@ + #include + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + class QTMovieGWorld; +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieTask.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieTask.h +index e394d6e..69bd623 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieTask.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieTask.h +@@ -29,9 +29,9 @@ + #include + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + class QTMovieTaskClient { +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieVisualContext.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieVisualContext.h +index 8410208..c497a66 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieVisualContext.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTMovieVisualContext.h +@@ -27,9 +27,9 @@ + #define QTMovieVisualContext_h + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + #include "QTMovie.h" +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTPixelBuffer.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTPixelBuffer.h +index 13630da..0c24824 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTPixelBuffer.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTPixelBuffer.h +@@ -27,9 +27,9 @@ + #define QTPixelBuffer_h + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + #include +diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTTrack.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTTrack.h +index bda5644..349a66c 100644 +--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTTrack.h ++++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/win/QTTrack.h +@@ -35,9 +35,9 @@ + #include + + #ifdef QTMOVIEWIN_EXPORTS +-#define QTMOVIEWIN_API __declspec(dllexport) ++#define QTMOVIEWIN_API + #else +-#define QTMOVIEWIN_API __declspec(dllimport) ++#define QTMOVIEWIN_API + #endif + + class QTTrack; +diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/API/c/WKBase.h b/src/3rdparty/webkit/Source/WebKit2/Shared/API/c/WKBase.h +index 1baa872..7a2c994 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/Shared/API/c/WKBase.h ++++ b/src/3rdparty/webkit/Source/WebKit2/Shared/API/c/WKBase.h +@@ -121,9 +121,9 @@ typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef; + #define WK_EXPORT __attribute__((visibility("default"))) + #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__) + #if BUILDING_WEBKIT +-#define WK_EXPORT __declspec(dllexport) ++#define WK_EXPORT + #else +-#define WK_EXPORT __declspec(dllimport) ++#define WK_EXPORT + #endif + #else /* !defined(WK_NO_EXPORT) */ + #define WK_EXPORT +-- +1.7.9.2 + -- cgit v0.12