diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-19 07:48:50 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-19 07:48:50 +0000 |
| commit | bc60c24bd7ffe8a4f4a1a3c404110bea6ffe68ef (patch) | |
| tree | 3aa0e7b48993c3af85b377c6f4cc6f26baa5a48c /packages/webkit | |
| parent | a9e4ad964a97281fc15b63f74307a0929fdfca2b (diff) | |
| parent | c46a44266a2269e5ca317d7ab87098ffe8c92505 (diff) | |
merge of '07e364c1caaec127626ec4949f3b7150cb090b5d'
and '64298b1eccb4cb0a71eec967d40f9b07077b3e4f'
Diffstat (limited to 'packages/webkit')
| -rw-r--r-- | packages/webkit/webkit/WebKit.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri index 00a72dc3d5..4db63eb54f 100644 --- a/packages/webkit/webkit/WebKit.pri +++ b/packages/webkit/webkit/WebKit.pri @@ -1,7 +1,10 @@ # Include file to make it easy to include WebKit into Qt projects -isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release +isEmpty(OUTPUT_DIR) { + CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release + CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug +} !gdk-port:CONFIG += qt-port qt-port:DEFINES += BUILDING_QT__=1 @@ -9,7 +12,7 @@ qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit gdk-port:CONFIG += link_pkgconfig gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__ -gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng +gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng -lcurl gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) DEFINES += USE_SYSTEM_MALLOC @@ -32,6 +35,7 @@ INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/bindings \ $$BASE_DIR/JavaScriptCore/bindings/c \ $$BASE_DIR/JavaScriptCore/wtf \ + $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ $$BASE_DIR/WebCore \ $$BASE_DIR/WebCore/ForwardingHeaders \ $$BASE_DIR/WebCore/platform \ |