Commit 6c3c21d2 authored by hausmann@webkit.org's avatar hausmann@webkit.org

.:

2009-07-13  Simon Hausmann  <simon.hausmann@nokia.com>

        Reviewed by Ariya Hidayat.

        Add the test netscape plugin for the Qt DRT to the build.

        * WebKit.pro:

WebKitTools:

2009-07-13  Simon Hausmann  <simon.hausmann@nokia.com>

        Reviewed by Ariya Hidayat.

        Fix test netscape plugin usage with the Qt DRT.

        * DumpRenderTree/qt/DumpRenderTree.cpp:
        (WebCore::WebPage::WebPage): Enable plugins in the settings.
        * Scripts/run-webkit-tests: Set the QT_WEBKIT_PLUGIN path to the correct build
        directory to make Qt DRT find the test netscape plugin.

LayoutTests:

2009-07-13  Simon Hausmann  <simon.hausmann@nokia.com>

        Reviewed by Ariya Hidayat.

        Enable a bunch of plugin layout tests for the Qt DRT.

        * platform/qt/Skipped:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45813 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f99df059
2009-07-13 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Add the test netscape plugin for the Qt DRT to the build.
* WebKit.pro:
2009-07-13 Drew Wilson <atwilson@google.com>
Reviewed by David Levin.
......
2009-07-13 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Enable a bunch of plugin layout tests for the Qt DRT.
* platform/qt/Skipped:
2009-07-13 Simon Hausmann <hausmann@webkit.org>
Reviewed by Ariya Hidayat.
......
......@@ -277,31 +277,22 @@ fast/xsl/xslt-second-level-import.xml
fast/xsl/xslt-string-parameters.html
fast/xsl/xslt-url.xml
fast/xsl/xslt_unicode.xml
plugins/bindings-test.html
plugins/call-as-function-test.html
plugins/destroy-stream-twice.html
plugins/embed-attributes-setting.html
plugins/embed-inside-object.html
plugins/get-empty-url.html
plugins/get-url-that-the-resource-load-delegate-will-disallow.html
plugins/get-url-with-blank-target.html
plugins/geturl-replace-query.html
plugins/inner-html-display-none.html
plugins/invoke.html
plugins/jsobjc-dom-wrappers.html
plugins/jsobjc-simple.html
plugins/mouse-events.html
plugins/netscape-destroy-plugin-script-objects.html
plugins/netscape-dom-access.html
plugins/netscape-enumerate.html
plugins/netscape-invoke-default.html
plugins/netscape-plugin-setwindow-size.html
plugins/open-and-close-window-with-plugin.html
plugins/plugin-javascript-access.html
plugins/plugin-remove-subframe.html
plugins/root-object-premature-delete-crash.html
plugins/throw-on-dealloc.html
plugins/undefined-property-crash.html
security/block-test.html
svg/W3C-SVG-1.1/animate-elem-02-t.svg
svg/W3C-SVG-1.1/animate-elem-03-t.svg
......
......@@ -7,6 +7,7 @@ SUBDIRS += \
WebKit/qt/QtLauncher \
WebKit/qt/tests
!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro \
WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
include(WebKit/qt/docs/docs.pri)
2009-07-13 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Fix test netscape plugin usage with the Qt DRT.
* DumpRenderTree/qt/DumpRenderTree.cpp:
(WebCore::WebPage::WebPage): Enable plugins in the settings.
* Scripts/run-webkit-tests: Set the QT_WEBKIT_PLUGIN path to the correct build
directory to make Qt DRT find the test netscape plugin.
2009-07-13 Simon Hausmann <hausmann@webkit.org>
Reviewed by Ariya Hidayat.
......
......@@ -101,6 +101,7 @@ WebPage::WebPage(QWidget *parent, DumpRenderTree *drt)
settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true);
settings()->setAttribute(QWebSettings::LinksIncludedInFocusChain, false);
settings()->setAttribute(QWebSettings::PluginsEnabled, true);
connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
this, SLOT(setViewGeometry(const QRect & )));
......
......@@ -1286,6 +1286,9 @@ sub openDumpTool()
$ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress;
}
}
if (isQt()) {
$ENV{QTWEBKIT_PLUGIN_PATH} = productDir() . "/lib/plugins";
}
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
$ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog <rdar://problem/4292995>
$ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc;
......
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