diff options
Diffstat (limited to 'Tools/WebKitTestRunner/InjectedBundle/qt')
-rw-r--r-- | Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro | 5 | ||||
-rw-r--r-- | Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro index 6838205..0bac510 100644 --- a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro +++ b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro @@ -72,7 +72,7 @@ INCLUDEPATH = \ PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" -unix:!mac:!symbian { +unix:!mac:!symbian:!embedded { CONFIG += link_pkgconfig PKGCONFIG += fontconfig } @@ -80,3 +80,6 @@ unix:!mac:!symbian { TARGET = WTRInjectedBundle DESTDIR = $$OUTPUT_DIR/lib !CONFIG(standalone_package): CONFIG -= app_bundle +linux-* { + QMAKE_LFLAGS += -Wl,--no-undefined +} diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp b/Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp index 91f49ea..72902e1 100644 --- a/Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp +++ b/Tools/WebKitTestRunner/InjectedBundle/qt/LayoutTestControllerQt.cpp @@ -28,6 +28,7 @@ #include "LayoutTestController.h" #include "InjectedBundle.h" +#include <QDir> #include <QObject> namespace WTR { @@ -70,6 +71,12 @@ void LayoutTestController::initializeWaitToDumpWatchdogTimerIfNeeded() m_waitToDumpWatchdogTimer.start(waitToDumpWatchdogTimerInterval * 1000); } +JSRetainPtr<JSStringRef> LayoutTestController::pathToLocalResource(JSStringRef url) +{ + QString path = QDir::toNativeSeparators(QString(reinterpret_cast<const QChar*>(JSStringGetCharactersPtr(url)), JSStringGetLength(url))); + return JSStringCreateWithCharacters(reinterpret_cast<const JSChar*>(path.constData()), path.length()); +} + } // namespace WTR #include "LayoutTestControllerQt.moc" |