Bug 50861

Created attachment 76291 [details] Fix include ordering like WebCore.pro and disabling NPAPI support for now

Comment on attachment 76291 [details] Fix include ordering like WebCore.pro and disabling NPAPI support for now OK.

Comment on attachment 76291 [details] Fix include ordering like WebCore.pro and disabling NPAPI support for now Clearing flags on attachment: 76291 Committed r73834: <http://trac.webkit.org/changeset/73834>

All reviewed patches have been landed. Closing bug.

Reopen, because it was rolled out by http://trac.webkit.org/changeset/73847

Created attachment 76385 [details] Fixed patch with no WK2_DIR

Comment on attachment 76385 [details] Fixed patch with no WK2_DIR Sorry about the build bust with the previous patch.

Comment on attachment 76385 [details] Fixed patch with no WK2_DIR View in context: https://bugs.webkit.org/attachment.cgi?id=76385&action=review Non symbian case looks good to me. > WebKit2/WebKit2.pro:641 > + !symbian: { > + # TODO: Resolve compiler errors with NPEvent/QEvents on Symbian > + INCLUDEPATH += WebProcess/Plugins/Netscape > + HEADERS += \ > + WebProcess/Plugins/Netscape/NetscapePlugin.h \ > + WebProcess/Plugins/Netscape/NetscapePluginModule.h \ > + WebProcess/Plugins/Netscape/NetscapePluginStream.h > + > + SOURCES += \ > + WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \ > + WebProcess/Plugins/Netscape/NetscapePlugin.cpp \ > + WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \ > + WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \ > + WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp > + } > "!symbian: {" should be on the beginning of the line

Laszlo, could you review the symbian case?

Comment on attachment 76385 [details] Fixed patch with no WK2_DIR View in context: https://bugs.webkit.org/attachment.cgi?id=76385&action=review r- because of the unnecessary symbian guards and the expected maintenance burden. Perhaps we should restrict this bug only to enable WebKit2 builds to build without NPAPI support for the Qt port. > WebKit2/WebKit2.pro:26 > +!symbian { In general we should aim to minimize the symbian guards to keep the build system manageable. I do not think this guard is essential - we have a similar section in WebCore.pro without symbian guards. Is this section fixing something ? > WebKit2/WebKit2.pro:38 > + MMP_RULES += "USERINCLUDE ../WebCore/bridge" There is a way around this problem by using the PREPEND_INCLUDEPATH variable. r65877 is an example of how this was resolved for WebCore.pro earlier. I think we should either follow the WebCore.pro solution here as well or we should delay addressing this problem after we got rid of the WebKit2 static library; in fact the problem might go away after we got rid of WebKit2 library. > WebKit2/WebKit2.pro:626 > + !symbian: { Let's re-use the "contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1)" guard here the same way as we have in WebCore.pro; this makes the configuration available on all QtWebKit ports and enables us to control this feature build time without changing the source code (e.g. from build-webkit).

Created attachment 76428 [details] use Netscape plugin feature flag

On second thoughts, this patch isn't need if we add all WK2 files to WebCore.pro, which is what is needed for symbols to be exported correctly on Symbian/RVCT and probably Windows.