[Qt] Replace GNU linker script for exports with export macros in WTF/JSC

https://bugs.webkit.org/show_bug.cgi?id=77723

Patch by Simon Hausmann <simon.hausmann@nokia.com> on 2012-02-03
Reviewed by Tor Arne Vestbø.

.:

* Source/api.pri: Remove use of GNU linker script on Linux.
* Source/qtwebkit-export.map: Removed.

Source/JavaScriptCore:

* wtf/Platform.h: Enable use of export macros.

Tools:

* Tools.pro: Compile WTR again on all platforms with WK2.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3948ded2ff627f74053b9673ca24c02e00747c5c..0ce25e37d815e3f9acf499abfd09e9a06bdac987 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Replace GNU linker script for exports with export macros in WTF/JSC
+        https://bugs.webkit.org/show_bug.cgi?id=77723
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Source/api.pri: Remove use of GNU linker script on Linux.
+        * Source/qtwebkit-export.map: Removed.
+
 2012-02-03  Shinya Kawanaka  <shinyak@google.com>
 
         Stop calling Element::ensureShadowRoot in Internals.

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index c5e6323c9179d408f78caac208858d7d54c05032..d2c5e0449f7d6528ce1ae92de1e0b59d0e1dbdbc 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Replace GNU linker script for exports with export macros in WTF/JSC
+        https://bugs.webkit.org/show_bug.cgi?id=77723
+
+        Reviewed by Tor Arne Vestbø.
+
+        * wtf/Platform.h: Enable use of export macros.
+
 2012-02-02  Hajime Morrita  <morrita@chromium.org>
 
         Unreviewed, removing an unnecessarily JS_PRIVATE_EXPORT annotation.

diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
index bc6e911e65fc560e03fc396ede657da48868ddd2..1b7b697705f25b194e7e2314b2341d7e1dcdb052 100644 (file)
--- a/Source/JavaScriptCore/wtf/Platform.h
+++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -1113,7 +1113,7 @@
    since most ports try to support sub-project independence, adding new headers
    to WTF causes many ports to break, and so this way we can address the build
    breakages one port at a time. */
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(QT)
 #define WTF_USE_EXPORT_MACROS 1
 #else
 #define WTF_USE_EXPORT_MACROS 0

diff --git a/Source/api.pri b/Source/api.pri
index 9b7b27bf2d9c43577cb1bb617cb152d64bd40f1b..d22d43cea5446c3a7f085a3d96c21bf6bd52c288 100644 (file)
--- a/Source/api.pri
+++ b/Source/api.pri
@@ -221,7 +221,3 @@ mac {
 
 plugin_backend_xlib: PKGCONFIG += x11
 
-linux-g++*: {
-    PRE_TARGETDEPS += $$PWD/qtwebkit-export.map
-    QMAKE_LFLAGS += -Wl,--version-script=$$PWD/qtwebkit-export.map
-}

diff --git a/Source/qtwebkit-export.map b/Source/qtwebkit-export.map
deleted file mode 100644 (file)
index ba2e2fb..0000000
--- a/Source/qtwebkit-export.map
+++ /dev/null
@@ -1,167 +0,0 @@
-qwk_1.0 {
-    global:
-    WK*;
-    JSValueToObject;
-    JSObjectGetProperty;
-    JSValueIsObjectOfClass;
-    JSObjectSetProperty;
-    JSValueMakeString;
-    JSValueIsObject;
-    JSStringCreateWithUTF8CString;
-    JSValueToNumber;
-    JSStringRelease;
-    JSValueToStringCopy;
-    JSStringRetain;
-    JSClassRetain;
-    JSObjectGetPrivate;
-    JSObjectMake;
-    JSValueMakeBoolean;
-    JSClassCreate;
-    JSValueMakeNull;
-    JSValueToBoolean;
-    JSValueMakeNumber;
-    JSObjectCallAsFunction;
-    JSValueMakeUndefined;
-    JSClassRelease;
-    JSStringIsEqualToUTF8CString;
-    JSStringGetUTF8CString;
-    JSContextGetGlobalObject;
-    kJSClassDefinitionEmpty;
-    JSValueIsNumber;
-    JSObjectGetPropertyAtIndex;
-    JSValueIsString;
-    JSStringGetLength;
-    JSStringGetCharactersPtr;
-    JSStringCreateWithCharacters;
-    JSValueUnprotect;
-    JSValueProtect;
-    JSEvaluateScript;
-    _WKContextSetAdditionalPluginsDirectory;
-    WTFReportArgumentAssertionFailure;
-    WTFReportAssertionFailure;
-    WTFReportBacktrace;
-    WTFInvokeCrashHook;
-    WTFSetCrashHook;
-    extern "C++" {
-        # WebKit 1 API
-        *QGraphicsWebView;
-        non-virtual?thunk?to?QGraphicsWebView*;
-        QGraphicsWebView::*;
-        *QWebDatabase;
-        non-virtual?thunk?to?QWebDatabase*;
-        QWebDatabase::*;
-        *QWebElement;
-        non-virtual?thunk?to?QWebElement*;
-        QWebElement::*;
-        *QWebElementCollection;
-        non-virtual?thunk?to?QWebElementCollection*;
-        QWebElementCollection::*;
-        *QWebHitTestResult;
-        non-virtual?thunk?to?QWebHitTestResult*;
-        QWebHitTestResult::*;
-        *QWebFrame;
-        non-virtual?thunk?to?QWebFrame*;
-        QWebFrame::*;
-        *QWebPage;
-        non-virtual?thunk?to?QWebPage*;
-        QWebPage::*;
-        *QWebView;
-        non-virtual?thunk?to?QWebView*;
-        QWebView::*;
-        *QWebSettings;
-        non-virtual?thunk?to?QWebSettings*;
-        QWebSettings::*;
-        *QWebInspector;
-        non-virtual?thunk?to?QWebInspector*;
-        QWebInspector::*;
-        *DumpRenderTreeSupportQt;
-        non-virtual?thunk?to?DumpRenderTreeSupportQt*;
-        DumpRenderTreeSupportQt::*;
-        *QWebPluginFactory;
-        non-virtual?thunk?to?QWebPluginFactory*;
-        QWebPluginFactory::*;
-        *QWebHistory;
-        non-virtual?thunk?to?QWebHistory*;
-        QWebHistory::*;
-        *QWebHistoryItem;
-        non-virtual?thunk?to?QWebHistoryItem*;
-        QWebHistoryItem::*;
-        *QWebSecurityOrigin;
-        non-virtual?thunk?to?QWebSecurityOrigin*;
-        QWebSecurityOrigin::*;
-        *QWebHistoryInterface;
-        non-virtual?thunk?to?QWebHistoryInterface*;
-        QWebHistoryInterface::*;
-        qWebKit*Version*;
-        "operator<<(QDataStream&, QWebHistory const&)";
-        "operator>>(QDataStream&, QWebHistory&)";
-
-        # WebKit 2 Helpers
-        WebKit::WebProcessMainQt*;
-        WTF::fastMalloc*;
-        WTF::fastFree*;
-        WTF::fastZeroedMalloc*;
-        WTF::Mutex::*;
-        WTF::currentThread*;
-
-        # WebKit 2 API
-        *QQuickWebView;
-        non-virtual?thunk?to?QQuickWebView*;
-        QQuickWebView::*;
-        *QQuickWebViewPrivate;
-        non-virtual?thunk?to?QQuickWebViewPrivate*;
-        QQuickWebViewPrivate::*;
-        *QWebIconImageProvider;
-        non-virtual?thunk?to?QWebIconImageProvider*;
-        QWebIconImageProvider::*;
-        *QtWebIconDatabaseClient;
-        non-virtual?thunk?to?QtWebIconDatabaseClient*;
-        QtWebIconDatabaseClient::*;
-        *QQuickWebViewPrivateExtension;
-        non-virtual?thunk?to?QQuickWebViewPrivateExtension*;
-        QQuickWebViewPrivateExtension::*;
-        *QQuickWebViewAttached;
-        non-virtual?thunk?to?QQuickWebViewAttached*;
-        QQuickWebViewAttached::*;
-        *QQuickWebViewExperimental;
-        non-virtual?thunk?to?QQuickWebViewExperimental*;
-        QQuickWebViewExperimental::*;
-        *QWebNavigationHistory;
-        non-virtual?thunk?to?QWebNavigationHistory*;
-        QWebNavigationHistory::*;
-        *QWebNavigationListModel;
-        non-virtual?thunk?to?QWebNavigationListModel*;
-        QWebNavigationListModel::*;
-        *QWebPreferences;
-        non-virtual?thunk?to?QWebPreferences*;
-        QWebPreferences::*;
-        *QWebDownloadItem;
-        non-virtual?thunk?to?QWebDownloadItem*;
-        QWebDownloadItem::*;
-        *QWebViewportInfo;
-        non-virtual?thunk?to?QWebViewportInfo;
-        QWebViewportInfo::*;
-        *QQuickWebPage;
-        non-virtual?thunk?to?QQuickWebPage*;
-        QQuickWebPage::*;
-        *QWebPermissionRequest;
-        non-virtual?thunk?to?QWebPermissionRequest*;
-        QWebPermissionRequest::*;
-        *QWebNavigationRequest;
-        non-virtual?thunk?to?QWebNavigationRequest*;
-        QWebNavigationRequest::*;
-        *QQuickUrlSchemeDelegate;
-        QQuickUrlSchemeDelegate::*;
-        *QQuickNetworkRequest;
-        QQuickNetworkRequest::*;
-        *QQuickNetworkReply;
-        QQuickNetworkReply::*;
-
-
-        # WebKit 2 C API mangled in C++
-        WKStringCopyQString*;
-        WKStringCreateWithQString*;
-        WKImageCreateQImage*;
-    };
-    local: *;
-};

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1c268231b84b8f2c011ac384ae7995953cbfe98d..b910c18faa8f5fdda1c4d0c6cd4766e73b21ddb2 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Replace GNU linker script for exports with export macros in WTF/JSC
+        https://bugs.webkit.org/show_bug.cgi?id=77723
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Tools.pro: Compile WTR again on all platforms with WK2.
+
 2012-02-03  Sriram Neelakandan  <sriram.neelakandan@gmail.com>
 
         Ensure that inspector disabled build works

diff --git a/Tools/Tools.pro b/Tools/Tools.pro
index 27a2537d6191250214087eb20aeb8fece4c2823a..4e7414fefe75777009000bc9d64b14709ec1ca8c 100644 (file)
--- a/Tools/Tools.pro
+++ b/Tools/Tools.pro
@@ -14,8 +14,8 @@ SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
 SUBDIRS += DumpRenderTree/qt/ImageDiff.pro
 
 !no_webkit2 {
-    SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
-    linux-g++*: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+    SUBDIRS += MiniBrowser/qt/MiniBrowser.pro \
+               WebKitTestRunner/WebKitTestRunner.pro
 }
 
 !win32:contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {