diff options
| author | Iain <qt-info@nokia.com> | 2010-04-15 16:08:17 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-26 15:14:37 (GMT) |
| commit | 445aa2f6526d871086ab61fb1ca24658f5a0ca8c (patch) | |
| tree | 909bb1913d64296cbcada225ee8265cef2c2cb2d /src/3rdparty/webkit | |
| parent | bf3c776cf5369fd83c54a96a4e381774ab037c08 (diff) | |
| download | Qt-445aa2f6526d871086ab61fb1ca24658f5a0ca8c.zip Qt-445aa2f6526d871086ab61fb1ca24658f5a0ca8c.tar.gz Qt-445aa2f6526d871086ab61fb1ca24658f5a0ca8c.tar.bz2 | |
Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by Iain
Re-apply change f14ae11e6731bd7416f45c3ef7ce464587862223 by Iain
Update WebKit DEF files on Symbian
Add/absent function with altered signature to BWINS DEF file.
Correct ordinal numbering in EABI DEF file, it was broken and causing
the build to fail.
Reviewed-by: TrustMe
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def | 3 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def index 086e986..cc609e1 100644 --- a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def +++ b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def @@ -623,5 +623,6 @@ EXPORTS ?qt_networkAccessAllowed@@YAX_N@Z @ 622 NONAME ; void qt_networkAccessAllowed(bool) ?qt_resumeActiveDOMObjects@@YAXPAVQWebFrame@@@Z @ 623 NONAME ; void qt_resumeActiveDOMObjects(class QWebFrame *) ?qt_suspendActiveDOMObjects@@YAXPAVQWebFrame@@@Z @ 624 NONAME ; void qt_suspendActiveDOMObjects(class QWebFrame *) - ?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int) + ?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ABSENT ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int) + ?qtwebkit_webframe_scrollRecursively@@YAXPAVQWebFrame@@HHABVQPoint@@@Z @ 626 NONAME ; void qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int, class QPoint const &) diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def index cfa8f7f..d244ad5 100644 --- a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def +++ b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def @@ -694,4 +694,4 @@ EXPORTS _Z25qt_resumeActiveDOMObjectsP9QWebFrame @ 693 NONAME _Z26qt_suspendActiveDOMObjectsP9QWebFrame @ 694 NONAME _Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameii @ 695 NONAME ABSENT - _Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 715 NONAME + _Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 696 NONAME |