diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-02-17 10:04:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-02-22 13:13:48 +0000 |
| commit | 80d93ab52a749216360f0082b9aa9e741a340a99 (patch) | |
| tree | dd68e4738517fb578f9379a65ca3ef8ecde91977 | |
| parent | 4284a8fec784d9b63e56a5a36a01252ba85d0b7c (diff) | |
| download | qt-creator-80d93ab52a749216360f0082b9aa9e741a340a99.tar.gz | |
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: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rwxr-xr-x | bin/qtcreator.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/bin/qtcreator.sh b/bin/qtcreator.sh index aca30f5b9e..454224c26e 100755 --- a/bin/qtcreator.sh +++ b/bin/qtcreator.sh @@ -1,5 +1,9 @@ #! /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+"$@"} |