diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-07-01 17:43:59 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-07-01 17:43:59 +0000 |
| commit | 1c3faf6ff6cb80399fce531b8f76f2775217e516 (patch) | |
| tree | 6280ef93a784f5041e8602dc4c6c6a569294ba5c | |
| parent | 71e0adfd56250f65d3d71959f8e080a2b0714f45 (diff) | |
webkit: update webkit.pri and webkit.pro
| -rw-r--r-- | packages/webkit/webkit/WebKit.pri | 6 | ||||
| -rw-r--r-- | packages/webkit/webkit/WebKit.pro | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri index 168e5558b6..00a72dc3d5 100644 --- a/packages/webkit/webkit/WebKit.pri +++ b/packages/webkit/webkit/WebKit.pri @@ -5,11 +5,11 @@ isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release !gdk-port:CONFIG += qt-port qt-port:DEFINES += BUILDING_QT__=1 -qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt +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) +gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) DEFINES += USE_SYSTEM_MALLOC @@ -22,7 +22,7 @@ qt-port:INCLUDEPATH += \ $$PWD/WebKitQt/Api gdk-port:INCLUDEPATH += \ $$BASE_DIR/WebCore/platform/gdk \ - $$BASE_DIR/WebCore/platform/network/gdk \ + $$BASE_DIR/WebCore/platform/network/curl \ $$BASE_DIR/WebCore/platform/graphics/cairo \ $$BASE_DIR/WebCore/loader/gdk \ $$BASE_DIR/WebCore/page/gdk diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro index eae6a46180..335d11e6e7 100644 --- a/packages/webkit/webkit/WebKit.pro +++ b/packages/webkit/webkit/WebKit.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs CONFIG += ordered !gdk-port:CONFIG += qt-port -SUBDIRS = \ +qt-port:SUBDIRS += WebKitQt/Plugins +SUBDIRS += \ WebCore \ JavaScriptCore/kjs/testkjs.pro |