Use QMAKE_LIBDIR instead of QMAKE_LFLAGS to specify the library search path for QtWeb...

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

diff --git a/ChangeLog b/ChangeLog
index 2d28953e90af5a40f06ba519350eb13421e0bad6..d0db7c0527f9a99c34ad565dd17f2c7363c332f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-26  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Use QMAKE_LIBDIR instead of QMAKE_LFLAGS to specify the library search path for QtWebKit, as the former is portable and correctly transformed to /LIBPATH: with msvc for example.
+
+        * WebKit.pri:
+
 2007-07-22  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Reviewed by Adam.

diff --git a/WebKit.pri b/WebKit.pri
index b4a41d4d409c4f929525c75df3e91ec5a54188a5..03699ef2a3fdad64ec74058e4e59ab1926f9a20a 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -9,7 +9,7 @@ isEmpty(OUTPUT_DIR) {
 !gdk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
 qt-port:!building-libs {
-    QMAKE_LFLAGS = -L$$OUTPUT_DIR/lib $$QMAKE_LFLAGS
+    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
     LIBS += -lQtWebKit
 }
 gdk-port:CONFIG += link_pkgconfig