Summary: | Build fix Symbian; clean Up WebKit/Qt if ENABLE_NETSCAPE_PLUGIN_API = 0 | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Laszlo Gombos <laszlo.gombos> | ||||||
Component: | WebKit Qt | Assignee: | Simon Hausmann <hausmann> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | hausmann, norbert.leser, yael, zecke | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | PC | ||||||||
OS: | All | ||||||||
Attachments: |
|
Description
Laszlo Gombos
2009-03-18 17:08:32 PDT
Created attachment 28740 [details] Proposed fix Clean ups in addition to fixing the bugs mentioned in the report) - All WebKit ports should now share Netscape plugin stubs (introduced by ChangeSet r41786) - The decision about Netscape plugin support for Qt is now in one place only (WebCore.pro) - it use to be in the source code as well, and the two were out-of-sync Lazlo, I just tried to build with the patch applied (before landing) and I noticed that it doesn't work entirely: tmp/PluginViewQt.o: In function `WebCore::PluginView::userAgentStatic()': PluginViewQt.cpp:(.text+0x60): multiple definition of `WebCore::PluginView::userAgentStatic()' tmp/TemporaryLinkStubs.o:TemporaryLinkStubs.cpp:(.text+0x0): first defined here tmp/PluginViewQt.o: In function `WebCore::PluginView::getValueStatic(NPNVariable, void*)': PluginViewQt.cpp:(.text+0x70): multiple definition of `WebCore::PluginView::getValueStatic(NPNVariable, void*)' tmp/TemporaryLinkStubs.o:TemporaryLinkStubs.cpp:(.text+0x10): first defined here I think we may still need the old defines around the two remaining functions in TemporaryLinkStubs.cpp. What do you think? Created attachment 29014 [details]
Revised patch
Apologies, I do not know how could I miss that.
If I'm not mistaken we can just remove those 2 functions from TemporaryLinkStubs and make the code even simpler.
Comment on attachment 28740 [details]
Proposed fix
bugzilla doesn't seem smart enough to remove things from the commit queue when obsolete. or at least our commit queue query isn't smart enough.
Simon, Can you please review this or assign it to someone else to review ? Thanks, Laszlo. Comment on attachment 29014 [details]
Revised patch
Looks sane to me.
|