[oe-commits] org.oe.dev webkit: update webkit.pri and webkit.pro

[koen commit]

webkit: update webkit.pri and webkit.pro

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2a02be8592cd72b9083661e82dc843f6bdd919be
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2a02be8592cd72b9083661e82dc843f6bdd919be
Files:
1
packages/webkit/webkit/WebKit.pri
packages/webkit/webkit/WebKit.pro
Diffs:

#
# mt diff -rb38c186df7008da4a76e1d85ab7bc952b9150f71 -r2a02be8592cd72b9083661e82dc843f6bdd919be
#
# 
# 
# patch "packages/webkit/webkit/WebKit.pri"
#  from [c8e302cc4f89f413203d7495f5420b30bd4d00d5]
#    to [66a2198f6e713621703e637cb558322feb4153e5]
# 
# patch "packages/webkit/webkit/WebKit.pro"
#  from [537b32b95d99345d2ca57b8a5d376255ab6fa594]
#    to [c4db9377c267835f4ec934a4d53207e26c25b99c]
# 
============================================================
--- packages/webkit/webkit/WebKit.pri	c8e302cc4f89f413203d7495f5420b30bd4d00d5
+++ packages/webkit/webkit/WebKit.pri	66a2198f6e713621703e637cb558322feb4153e5
@@ -5,11 +5,11 @@ qt-port:DEFINES += BUILDING_QT__=1
 
 !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 @@ gdk-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
============================================================
--- packages/webkit/webkit/WebKit.pro	537b32b95d99345d2ca57b8a5d376255ab6fa594
+++ packages/webkit/webkit/WebKit.pro	c4db9377c267835f4ec934a4d53207e26c25b99c
@@ -1,7 +1,8 @@ CONFIG += ordered
 TEMPLATE = subdirs
 CONFIG += ordered
 !gdk-port:CONFIG += qt-port
-SUBDIRS = \
+qt-port:SUBDIRS += WebKitQt/Plugins
+SUBDIRS += \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro