Spectrum build: fixed DLL rpath

Rather than explicitly modifying LD_LIBRARY_PATH using a shell script
when the application is launched, the relative path from the
application binary to the FFT library is encoded in the application
using an --rpath flag.

Task-number: QTBUG-11756
Reviewed-by: Andy Shaw

1 files changed, 3 insertions, 10 deletions

diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index 22ee3b1..5410b2b 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -3,7 +3,6 @@ include(../spectrum.pri)
 TEMPLATE = app
 
 TARGET = spectrum
-unix: !macx: !symbian: TARGET = spectrum.bin
 
 QT       += multimedia
 
@@ -112,15 +111,9 @@ symbian {
         # Specify directory in which to create spectrum application
         DESTDIR = ../bin
 
-        unix: !symbian {
-            # On unices other than Mac OSX, we copy a shell script into the bin directory.
-            # This script takes care of correctly setting the LD_LIBRARY_PATH so that
-            # the dynamic library can be located.
-            copy_launch_script.target = copy_launch_script
-            copy_launch_script.commands = \
-                install -m 0555 $$QT_SOURCE_TREE/demos/spectrum/app/spectrum.sh ../bin/spectrum
-            QMAKE_EXTRA_TARGETS += copy_launch_script
-            POST_TARGETDEPS += copy_launch_script
+        unix: {
+            # Provide relative path from application to fftreal library
+            QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
         }
     }
 }