Commit Graph

4 Commits

Author SHA1 Message Date
Oswald Buddenhagen
3ff007d573 don't detect readlink a-priori
it's pointless and causes an unnecessary delay.
what's worse, we wouldn't actually know whether we found a compatible
(gnu) readlink, so the fallback would never get activated. this would be
the case on macos (the problem wasn't noticed so far, because on macos
we build a bundle which doesn't need the wrapper in the first place).

Change-Id: Ibf4c370d5d9e25064e80faeaf12eb5fa1bc68c20
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-27 13:06:53 +00:00
Oswald Buddenhagen
5654828b22 fix hand-crafted symlink resolution
the base directory for making the symlink target absolute is of course
the dirname of the original file, not the target itself.

Change-Id: If5171ead8da0aa2afcaa8ccd6365771441440146
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-27 13:06:38 +00:00
Eike Ziller
80d93ab52a 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>
2016-02-22 13:13:48 +00:00
Oswald Buddenhagen
4078fba4ec re-add LD_LIBRARY_PATH script
we need to override RUNPATHs from possible plugins.

due to d7d23226, this should not re-introduce QTCREATORBUG-1646.

unlike in the previous incarnation, we don't replace the binary with the
script, but give the script an extension. this is nicer for packagers
and less confusing in creator's own run configurations. the .desktop
files created by our installers need to be adjusted for that.

Task-number: QTCREATORBUG-5565
Change-Id: Icd2fa55456754a05257376b8288e8bdf423c62db
Reviewed-on: http://codereview.qt.nokia.com/3180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-08-18 15:40:11 +02:00