summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorAdrian Constantin <adrian.constantin@nokia.com>2010-05-10 06:27:24 (GMT)
committerAdrian Constantin <adrian.constantin@nokia.com>2010-06-01 12:24:16 (GMT)
commitbf8990fbc0aa9a23414a27f28bc9834a9241915c (patch)
tree23bbcca3de53245be2eb63049780931e16f28d41 /mkspecs
parent9f3548b983aaac50a1ef638fece2e97145aa212b (diff)
downloadQt-bf8990fbc0aa9a23414a27f28bc9834a9241915c.zip
Qt-bf8990fbc0aa9a23414a27f28bc9834a9241915c.tar.gz
Qt-bf8990fbc0aa9a23414a27f28bc9834a9241915c.tar.bz2
Remove workarounds for -rpath-link options
Reviewed-by: Stefano Pironato
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/linux-g++-maemo/qmake.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf
index 38c26a6..822266f 100644
--- a/mkspecs/linux-g++-maemo/qmake.conf
+++ b/mkspecs/linux-g++-maemo/qmake.conf
@@ -12,9 +12,6 @@ QMAKE_INCREMENTAL_STYLE = sublib
include(../common/g++.conf)
include(../common/linux.conf)
-# Work round scratchbox not having standard paths in it's default search path
-QMAKE_LFLAGS += -Wl,-rpath-link=/lib
-QMAKE_LFLAGS += -Wl,-rpath-link=/usr/lib
# Override the default lib/include directories for scratchbox:
QMAKE_INCDIR_X11 = /usr/include/X11