[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: http://svn.webkit.org/repository/webkit/trunk@106650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2474bf8d
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.
......
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.
......@@ -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
......
......@@ -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
}
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: *;
};
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
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment