diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-31 18:34:18 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-31 18:34:18 +0000 |
commit | 133a314a4f1d38fc93d37caf204c9946b92eccf3 (patch) | |
tree | a985dc190621c74caedb209b156cd5117cb77428 /meta/packages/webkit/files/WebKit.pri | |
parent | 544fa41378c23e3e5b4519fa8fecb9351f299b6c (diff) | |
download | poky-133a314a4f1d38fc93d37caf204c9946b92eccf3.tar.gz |
webkit: upgraded to rev 31467, enabled SVG fonts
http://bugs.webkit.org/show_bug.cgi?id=18239 was reported as SVG fonts
support is required to make Webkit built.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4151 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/webkit/files/WebKit.pri')
-rw-r--r-- | meta/packages/webkit/files/WebKit.pri | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/packages/webkit/files/WebKit.pri index 36404ac803..d12423beb2 100644 --- a/meta/packages/webkit/files/WebKit.pri +++ b/meta/packages/webkit/files/WebKit.pri | |||
@@ -17,7 +17,7 @@ qt-port:!building-libs { | |||
17 | gtk-port:!building-libs { | 17 | gtk-port:!building-libs { |
18 | QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR | 18 | QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR |
19 | LIBS += -lWebKitGtk | 19 | LIBS += -lWebKitGtk |
20 | DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport | 20 | DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit |
21 | } | 21 | } |
22 | 22 | ||
23 | gtk-port { | 23 | gtk-port { |
@@ -36,6 +36,7 @@ gtk-port { | |||
36 | 36 | ||
37 | # We use the curl http backend on all platforms | 37 | # We use the curl http backend on all platforms |
38 | PKGCONFIG += libcurl | 38 | PKGCONFIG += libcurl |
39 | DEFINES += WTF_USE_CURL=1 | ||
39 | 40 | ||
40 | LIBS += -lWebKitGtk -ljpeg -lpng | 41 | LIBS += -lWebKitGtk -ljpeg -lpng |
41 | 42 | ||
@@ -72,8 +73,9 @@ gtk-port:INCLUDEPATH += \ | |||
72 | $$BASE_DIR/WebCore/platform/graphics/cairo \ | 73 | $$BASE_DIR/WebCore/platform/graphics/cairo \ |
73 | $$BASE_DIR/WebCore/loader/gtk \ | 74 | $$BASE_DIR/WebCore/loader/gtk \ |
74 | $$BASE_DIR/WebCore/page/gtk \ | 75 | $$BASE_DIR/WebCore/page/gtk \ |
75 | $$BASE_DIR/WebKit/gtk/WebView \ | 76 | $$BASE_DIR/WebKit/gtk \ |
76 | $$BASE_DIR/WebKit/gtk/WebCoreSupport | 77 | $$BASE_DIR/WebKit/gtk/WebCoreSupport \ |
78 | $$BASE_DIR/WebKit/gtk/webkit | ||
77 | INCLUDEPATH += \ | 79 | INCLUDEPATH += \ |
78 | $$BASE_DIR/JavaScriptCore/ \ | 80 | $$BASE_DIR/JavaScriptCore/ \ |
79 | $$BASE_DIR/JavaScriptCore/kjs \ | 81 | $$BASE_DIR/JavaScriptCore/kjs \ |
@@ -95,7 +97,8 @@ INCLUDEPATH += \ | |||
95 | $$BASE_DIR/WebCore/rendering \ | 97 | $$BASE_DIR/WebCore/rendering \ |
96 | $$BASE_DIR/WebCore/history \ | 98 | $$BASE_DIR/WebCore/history \ |
97 | $$BASE_DIR/WebCore/xml \ | 99 | $$BASE_DIR/WebCore/xml \ |
98 | $$BASE_DIR/WebCore/html | 100 | $$BASE_DIR/WebCore/html \ |
101 | $$BASE_DIR/WebCore/plugins | ||
99 | 102 | ||
100 | 103 | ||
101 | macx { | 104 | macx { |