From dab38c569cbe34655048bc8df9496103ae32d4bb Mon Sep 17 00:00:00 2001 From: hausmann Date: Thu, 26 Jul 2007 14:47:27 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24642 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 8 ++++++++ WebKit.pri | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2d28953e90af..d0db7c0527f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-07-26 Simon Hausmann + + 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 Reviewed by Adam. diff --git a/WebKit.pri b/WebKit.pri index b4a41d4d409c..03699ef2a3fd 100644 --- 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 -- 2.36.0