37727 2010-04-16 13:48:15 -0700 [Qt] Webkit fixes for RVCT4 2010-04-26 08:26:29 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) S60 Hardware Other CLOSED FIXED Qt P2 Normal --- 35784 0 iain.campbell webkit-qt-unassigned hausmann koshuin laszlo.gombos oldest_to_newest 213407 0 iain.campbell 2010-04-16 13:48:15 -0700 RVCT 4 is far more strict with regards to symbol visiblity that RVCT2.2, and will hide symbols unless all references have default visibility in the object files. This patch corrects the symbol visibility which was set incorrectly for DLL-based platforms like Symbian (those that use __declspec(dllimport) and (dllexport)). 213410 1 iain.campbell 2010-04-16 13:50:43 -0700 diff --git a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp index d7982fa..2fcce5b 100644 --- a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp +++ b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp @@ -51,7 +51,7 @@ #include "NotImplemented.h" QT_BEGIN_NAMESPACE -extern Q_GUI_EXPORT bool qt_tab_all_widgets; // from qapplication.cpp +Q_DECL_IMPORT extern bool qt_tab_all_widgets; // from qapplication.cpp QT_END_NAMESPACE namespace WebCore { 213430 2 hausmann 2010-04-16 14:31:45 -0700 (In reply to comment #1) > diff --git a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp > b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp > index d7982fa..2fcce5b 100644 > --- a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp > +++ b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp > @@ -51,7 +51,7 @@ > #include "NotImplemented.h" > > QT_BEGIN_NAMESPACE > -extern Q_GUI_EXPORT bool qt_tab_all_widgets; // from qapplication.cpp > +Q_DECL_IMPORT extern bool qt_tab_all_widgets; // from qapplication.cpp So this patch does two things: 1) It removes the extern keyword and 2) It replaces Q_GUI_EXPORT with Q_DECL_IMPORT AFAIK Q_GUI_EXPORT should be defined to Q_DECL_IMPORT in qglobal.h _unless_ we're building QtGui itself, which is not the case here. Can you elaborate how your fix works? :) 214519 3 koshuin 2010-04-20 00:50:30 -0700 (In reply to comment #2) > 1) It removes the extern keyword > 2) It replaces Q_GUI_EXPORT with Q_DECL_IMPORT It doesn't remove the extern keyword, but swaps declspec and extern. You are right that there is no need to replace Q_GUI_EXPORT with Q_DECL_IMPORT i.e. Q_GUI_EXPORT extern bool qt_tab_all_widgets; // from qapplication.cpp would be equally good fix. 214640 4 hausmann 2010-04-20 07:14:23 -0700 (In reply to comment #3) > (In reply to comment #2) > > 1) It removes the extern keyword > > 2) It replaces Q_GUI_EXPORT with Q_DECL_IMPORT > > It doesn't remove the extern keyword, but swaps declspec and extern. > You are right that there is no need to replace Q_GUI_EXPORT with Q_DECL_IMPORT > i.e. > Q_GUI_EXPORT extern bool qt_tab_all_widgets; // from qapplication.cpp > would be equally good fix. Ooops, I see, so the fix is to swap the two? 217109 5 54301 hausmann 2010-04-26 08:05:00 -0700 Created attachment 54301 Patch 217112 6 hausmann 2010-04-26 08:12:11 -0700 Committed r58257: <http://trac.webkit.org/changeset/58257> 217113 7 hausmann 2010-04-26 08:12:39 -0700 Cherry-picked into qtwebkit-4.6 with commit 4fb414b38f7c7c8439ce6a4323f1acb057a3ff20 217115 8 laszlo.gombos 2010-04-26 08:13:49 -0700 Two more instances of this - maybe we want to change those as well: WebKit/qt/Api/qwebframe.cpp:extern Q_GUI_EXPORT int qt_defaultDpi(); WebCore/plugins/mac/PluginViewMac.cpp:extern Q_GUI_EXPORT OSWindowRef qt_mac_window_for(const QWidget* w); 217118 9 hausmann 2010-04-26 08:25:39 -0700 Revision r58257 cherry-picked into qtwebkit-2.0 with commit b8a9d4b4dd69f952857333bcd5596989008560f3 54301 2010-04-26 08:05:00 -0700 2010-04-26 08:08:13 -0700 Patch bug-37727-20100426170458.patch text/plain 1008 hausmann ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDVjOGJiZS4uMjVhZDIwOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNC0yNiAgU2ltb24gSGF1c21h bm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBGaXggY29tcGlsYXRpb24gd2l0aCBSVkNUIDQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NzI3CisK KyAgICAgICAgU3dhcCBleHRlcm4gYW5kIGRlY2xzcGVjIHRvIGZpeCB2aXNpYmlsaXR5IG9mIHN5 bWJvbCBpbXBvcnRlZCBmcm9tIFF0R3VpLgorCisgICAgICAgICogcGFnZS9xdC9FdmVudEhhbmRs ZXJRdC5jcHA6CisKIDIwMTAtMDQtMjYgIE1hcmt1cyBHb2V0eiAgPE1hcmt1cy5Hb2V0ekBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BhZ2UvcXQvRXZlbnRIYW5kbGVyUXQuY3BwIGIvV2ViQ29yZS9wYWdlL3F0L0V2 ZW50SGFuZGxlclF0LmNwcAppbmRleCBkNzk4MmZhLi41YjI0ZWFlIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BhZ2UvcXQvRXZlbnRIYW5kbGVyUXQuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9xdC9FdmVu dEhhbmRsZXJRdC5jcHAKQEAgLTUxLDcgKzUxLDcgQEAKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRl ZC5oIgogCiBRVF9CRUdJTl9OQU1FU1BBQ0UKLWV4dGVybiBRX0dVSV9FWFBPUlQgYm9vbCBxdF90 YWJfYWxsX3dpZGdldHM7IC8vIGZyb20gcWFwcGxpY2F0aW9uLmNwcAorUV9HVUlfRVhQT1JUIGV4 dGVybiBib29sIHF0X3RhYl9hbGxfd2lkZ2V0czsgLy8gZnJvbSBxYXBwbGljYXRpb24uY3BwCiBR VF9FTkRfTkFNRVNQQUNFCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK