Commit 80d93ab5 authored by Eike Ziller's avatar Eike Ziller

Fix qtcreator.sh for the new Qt deployment necessary with Qt 5.6

We need to deploy Qt 5.6 into its own directory (lib/Qt/) in the
Qt Creator packages, so the LD_LIBRARY_PATH that is set in
qtcreator.sh needs that too.

Task-number: QTCREATORBUG-15748
Change-Id: I637322dfe5eb669b6447aa2f2b52e3ba2fe2979f
Reviewed-by: default avatarEdward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
parent 4284a8fe
#! /bin/sh
# Use this script if you add paths to LD_LIBRARY_PATH
# that contain libraries that conflict with the
# libraries that Qt Creator depends on.
makeAbsolute() {
case $1 in
/*)
......@@ -30,6 +34,12 @@ fi
bindir=`dirname "$me"`
libdir=`cd "$bindir/../lib" ; pwd`
LD_LIBRARY_PATH=$libdir:$libdir/qtcreator${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
# Add path to deployed Qt libraries in package
qtlibdir=$libdir/Qt/lib
if test -d "$qtlibdir"; then
qtlibpath=:$qtlibdir
fi
# Add Qt Creator library path
LD_LIBRARY_PATH=$libdir:$libdir/qtcreator$qtlibpath${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
exec "$bindir/qtcreator" ${1+"$@"}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment