diff options
Diffstat (limited to 'Tools/WebKitTestRunner/InjectedBundle/qt')
| -rw-r--r-- | Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro | 17 | ||||
| -rw-r--r-- | Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp | 34 |
2 files changed, 44 insertions, 7 deletions
diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro index 24db4b8..6838205 100644 --- a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro +++ b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro @@ -24,6 +24,7 @@ SOURCES += \ ../LayoutTestController.h \ ../Bindings/JSWrapper.cpp \ ActivateFontsQt.cpp \ + InjectedBundleQt.cpp \ LayoutTestControllerQt.cpp \ $$GENERATED_SOURCES_DIR/JSEventSendingController.cpp \ $$GENERATED_SOURCES_DIR/JSGCController.cpp \ @@ -45,27 +46,29 @@ HEADERS += \ include(../../../../Source/WebKit.pri) include(../../../../Source/JavaScriptCore/JavaScriptCore.pri) -addJavaScriptCoreLib(../../../JavaScriptCore) +prependJavaScriptCoreLib(../../../JavaScriptCore) include(../../../../Source/WebKit2/WebKit2.pri) -addWebKit2Lib(../../../WebKit2) +prependWebKit2Lib(../../../WebKit2) -INCLUDEPATH += \ +INCLUDEPATH = \ $$PWD \ $$PWD/.. \ $$PWD/../.. \ $$PWD/../Bindings \ + $$PWD/../../../../Source \ $$PWD/../../../../Source/JavaScriptCore \ - $$PWD/../../../../Source/JavaScriptCore/wtf \ + $$PWD/../../../../Source/JavaScriptCore/ForwardingHeaders \ + $$PWD/../../../../Source/JavaScriptCore/wtf/unicode \ $$PWD/../../../../Source/WebCore \ $$PWD/../../../../Source/WebCore/platform/text \ $$PWD/../../../../Source/WebKit2 \ $$PWD/../../../../Source/WebKit2/Shared \ - $$GENERATED_SOURCES_DIR - -INCLUDEPATH += \ + $$OUTPUT_DIR/include/QtWebKit \ $$OUTPUT_DIR/include \ + $$GENERATED_SOURCES_DIR \ $$WC_GENERATED_SOURCES_DIR + PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp new file mode 100644 index 0000000..52502ed --- /dev/null +++ b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2011 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "InjectedBundle.h" + +namespace WTR { + +void InjectedBundle::platformInitialize(WKTypeRef) +{ +} + +} // namespace WTR |