2007-05-11 Holger Freyther <freyther@kde.org>

        Reviewed by Mark Rowe.

        Move libcurl configuration into WebKit.pri so it will be used by GdkLauncher.

        * WebCore.pro:

2007-05-11  Holger Freyther <freyther@kde.org>

        Reviewed by Mark Rowe.

        Move libcurl configuration into WebKit.pri so it will be used by GdkLauncher,
        and add ICU configuration to QMAKE_CXXFLAGS.

        * WebKit.pri:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21394 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 903a04688008f980e93c01b1b4cd90684ad3dfe5..159ddda599fb18f0757560da5c4ec2c05800486b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-11  Holger Freyther <freyther@kde.org>
+
+        Reviewed by Mark Rowe.
+
+        Move libcurl configuration into WebKit.pri so it will be used by GdkLauncher,
+        and add ICU configuration to QMAKE_CXXFLAGS.
+
+        * WebKit.pri:
+
 2007-05-06  Erik Bunce  <kde@bunce.us>
 
         Reviewed by Mark Rowe.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4bd9eaaccb6b8af435c4669265363803ebd99abc..980df8b521784073980b67c7419f363c37f3fa11 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-11  Holger Freyther <freyther@kde.org>
+
+        Reviewed by Mark Rowe.
+
+        Move libcurl configuration into WebKit.pri so it will be used by GdkLauncher.
+
+        * WebCore.pro:
+
 2007-05-10  David Hyatt  <hyatt@apple.com>
 
         <rdar://problem/5015522> Bounds rectangle of unloaded images is 

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index f67b8bcff7f529ff8faf85fcf1e66cb752065749..9d2a12af777ea702cac664434de1256a124fe9fb 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -39,8 +39,6 @@ DEFINES += ENABLE_XSLT=1
 qt-port:DEFINES += ENABLE_SVG=1
 
 DEFINES += WTF_CHANGES=1
-gdk-port:PKGCONFIG += libcurl
-gdk-port:LIBS += $$system(icu-config --ldflags)
 
 include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
 

diff --git a/WebKit.pri b/WebKit.pri
index 444b589b58c81914d8ac5a2f003e9b657f5359e2..168e5558b6ecdcd612c954708980a5b6cd4db0fe 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -7,9 +7,10 @@ isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
 qt-port:DEFINES += BUILDING_QT__=1
 qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
 gdk-port:CONFIG += link_pkgconfig
-gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0
+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
+gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags)
+gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
 
 DEFINES += USE_SYSTEM_MALLOC
 CONFIG(release) {