Ensure QtLauncher and DumpRenderTree are linked against the uninstalled QtWebKit...

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 412ad9b77c79bcac230ae2b47f2a4711ee623c83..b4a41d4d409c4f929525c75df3e91ec5a54188a5 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -8,7 +8,10 @@ isEmpty(OUTPUT_DIR) {
 
 !gdk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
 
 !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__
 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 b6ec4369005fbe1145183b44447296f150a16e6e..74cde8b4230b2e19317428694ec0f1430e726be7 100644 (file)
--- a/WebKitQt/QtLauncher/QtLauncher.pro
+++ b/WebKitQt/QtLauncher/QtLauncher.pro
@@ -3,4 +3,4 @@ SOURCES += main.cpp
 
 include(../../WebKit.pri)
 
 
 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 318126348f60cd7513b2543a4fef914d879db937..b822d149da8e98801043d5ee7947f78ea3868493 100644 (file)
--- 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 {
 SOURCES = DumpRenderTree.cpp main.cpp jsobjects.cpp
 
 unix:!mac {

-    QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR

 }
 }