Link QtLauncher into $$OUTPUT_DIR/bin
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Jul 2007 16:10:29 +0000 (16:10 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Jul 2007 16:10:29 +0000 (16:10 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24775 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitQt/ChangeLog
WebKitQt/QtLauncher/QtLauncher.pro
WebKitTools/ChangeLog
WebKitTools/Scripts/run-launcher

index df7e611b5f94cdffe470091201f4150de5c6f744..08c9930f3030afbb12c43d2a8d5278343a5e2149 100644 (file)
@@ -1,3 +1,11 @@
+2007-07-30  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Link QtLauncher into $$OUTPUT_DIR/bin
+
+        * QtLauncher/QtLauncher.pro:
+
 2007-07-29  Adam Treat  <treat@kde.org>
 
         Reviewed by George Staikos.
index 36201236ad8b8b2bd0f411d0ee07f5b3d2b5432f..307d019d79e677eb9ec241db3691049bcf3d17d7 100644 (file)
@@ -1,6 +1,7 @@
 TEMPLATE = app
 SOURCES += main.cpp
 CONFIG -= app_bundle
+DESTDIR = ../../bin
 
 include(../../WebKit.pri)
 
index 7f9e679bf9af696dab041eba9549fc62471efc8e..fbec8ce0a7e6b1136b5bf944b6c1e40662287e99 100644 (file)
@@ -1,3 +1,11 @@
+2007-07-30  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Link QtLauncher into $$OUTPUT_DIR/bin
+
+        * Scripts/run-launcher:
+
 2007-07-27  David Kilzer  <ddkilzer@apple.com>
 
         Reviewed by Geoff and Darin.
index f268ca3a9bfb0cb942abad9afba1625ede01f4da..3e60ddc7d3581ca05e9ba5c7198fa0f73ef9f7fd 100755 (executable)
@@ -51,7 +51,7 @@ $ENV{LD_LIBRARY_PATH} = $productDir;
 if (isGdk()) {
   $launcherPath = "$launcherPath/WebKitTools/GdkLauncher/GdkLauncher";
 } elsif (isQt()) {
-  $launcherPath = "$launcherPath/WebKitQt/QtLauncher/QtLauncher";
+  $launcherPath = "$launcherPath/bin/QtLauncher";
 } else {
   die;
 }