From: hausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 26 Jul 2007 09:36:51 +0000 (+0000)
Subject: Ensure QtLauncher and DumpRenderTree are linked against the uninstalled QtWebKit... 
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=7aa30b7b64d6315d6bc69e5028f6485b92f8c322

Ensure QtLauncher and DumpRenderTree are linked against the uninstalled QtWebKit library by making sure $$OUTPUT_DIR/lib appears before $QTDIR/lib in the library search path and rpath.


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

diff --git a/WebKit.pri b/WebKit.pri
index 412ad9b77c79..b4a41d4d409c 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -8,7 +8,10 @@ isEmpty(OUTPUT_DIR) {
 
 !gdk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
-qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
+qt-port:!building-libs {
+    QMAKE_LFLAGS = -L$$OUTPUT_DIR/lib $$QMAKE_LFLAGS
+    LIBS += -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__
diff --git a/WebKitQt/QtLauncher/QtLauncher.pro b/WebKitQt/QtLauncher/QtLauncher.pro
index b6ec4369005f..74cde8b4230b 100644
--- a/WebKitQt/QtLauncher/QtLauncher.pro
+++ b/WebKitQt/QtLauncher/QtLauncher.pro
@@ -3,4 +3,4 @@ SOURCES += main.cpp
 
 include(../../WebKit.pri)
 
-QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
index 318126348f60..b822d149da8e 100644
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
@@ -11,5 +11,5 @@ HEADERS = DumpRenderTree.h jsobjects.h
 SOURCES = DumpRenderTree.cpp main.cpp jsobjects.cpp
 
 unix:!mac {
-    QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
 }