diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro')
| -rw-r--r-- | WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro index d596f33..2b3cbaf 100644 --- a/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro +++ b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro @@ -2,6 +2,14 @@ TEMPLATE = lib isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. +CONFIG(standalone_package) { + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../../../WebCore/generated +} else { + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../../../WebCore/generated +} + +GENERATED_SOURCES_DIR = ../../generated + SOURCES += \ ../InjectedBundle.cpp \ ../InjectedBundle.h \ @@ -17,9 +25,9 @@ SOURCES += \ ../Bindings/JSWrapper.cpp \ ActivateFontsQt.cpp \ LayoutTestControllerQt.cpp \ - $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSEventSendingController.cpp \ - $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSGCController.cpp \ - $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSLayoutTestController.cpp \ + $$GENERATED_SOURCES_DIR/JSEventSendingController.cpp \ + $$GENERATED_SOURCES_DIR/JSGCController.cpp \ + $$GENERATED_SOURCES_DIR/JSLayoutTestController.cpp \ HEADERS += \ ../ActivateFonts.h \ @@ -50,11 +58,11 @@ INCLUDEPATH += \ $$PWD/../../../../JavaScriptCore/wtf \ $$PWD/../../../../WebKit2 \ $$PWD/../../../../WebKit2/Shared \ - $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated + $$GENERATED_SOURCES_DIR INCLUDEPATH += \ $$OUTPUT_DIR/include \ - $$OUTPUT_DIR/WebCore/generated + $$WC_GENERATED_SOURCES_DIR PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER" |