diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro')
| -rw-r--r-- | WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro deleted file mode 100644 index f43bb0e..0000000 --- a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro +++ /dev/null @@ -1,71 +0,0 @@ -TARGET = WebKitTestRunner -CONFIG -= app_bundle - -BASEDIR = $$PWD/../ -isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../.. -GENERATED_SOURCES_DIR = ../generated - - -include(../../../WebKit.pri) - -!CONFIG(release, debug|release) { - OBJECTS_DIR = obj/debug -} else { # Release - OBJECTS_DIR = obj/release -} - -DEFINES += USE_SYSTEM_MALLOC - -INCLUDEPATH += \ - $$BASEDIR \ - $$BASEDIR/../../JavaScriptCore \ - $$BASEDIR/../../WebKit2 \ - $$BASEDIR/../../WebKit2/Shared \ - $$BASEDIR/../../WebKit2/UIProcess/API/qt \ - $$BASEDIR/../../WebKit2/UIProcess/API/cpp/qt \ - $$GENERATED_SOURCES_DIR - -INCLUDEPATH += \ - $$OUTPUT_DIR/include \ - - -DESTDIR = $$OUTPUT_DIR/bin - -unix:!mac { - CONFIG += link_pkgconfig - PKGCONFIG += fontconfig -} - -QT = core gui network - -HEADERS = \ - $$BASEDIR/PlatformWebView.h \ - $$BASEDIR/StringFunctions.h \ - $$BASEDIR/TestController.h \ - $$BASEDIR/TestInvocation.h - -SOURCES = \ - main.cpp \ - PlatformWebViewQt.cpp \ - TestControllerQt.cpp \ - $$BASEDIR/TestController.cpp \ - $$BASEDIR/TestInvocation.cpp \ - -PREFIX_HEADER = $$BASEDIR/WebKitTestRunnerPrefix.h -QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" - -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -} - -include(../../../JavaScriptCore/JavaScriptCore.pri) -addJavaScriptCoreLib(../../../JavaScriptCore) |