summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-07-05 14:22:42 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-07-06 08:26:38 (GMT)
commitf36d829ef02c54b18734dd027a1c0d9b55a6171f (patch)
tree20090ee4953a8331375142fb8fc92219431f4b08
parent6f1b1f4e5eb6666ed25f770ded1a721b5d1e4907 (diff)
downloadQt-f36d829ef02c54b18734dd027a1c0d9b55a6171f.zip
Qt-f36d829ef02c54b18734dd027a1c0d9b55a6171f.tar.gz
Qt-f36d829ef02c54b18734dd027a1c0d9b55a6171f.tar.bz2
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
-rw-r--r--demos/spectrum/app/app.pro13
-rw-r--r--demos/spectrum/app/spectrum.sh50
2 files changed, 3 insertions, 60 deletions
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index ebeef87..28fdab0 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
@@ -113,15 +112,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
}
}
}
diff --git a/demos/spectrum/app/spectrum.sh b/demos/spectrum/app/spectrum.sh
deleted file mode 100644
index 2a230ed..0000000
--- a/demos/spectrum/app/spectrum.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#############################################################################
-##
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (qt-info@nokia.com)
-##
-## This file is part of the examples of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 2.1 requirements
-## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Nokia gives you certain additional
-## rights. These rights are described in the Nokia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-
-# Shell script for launching spectrum application on Unix systems other than Mac OSX
-
-bindir=`dirname "$0"`
-LD_LIBRARY_PATH="${bindir}:${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH
-exec "${bindir}/spectrum.bin" ${1+"$@"}
-