summaryrefslogtreecommitdiff
path: root/bin/qtcreator.sh
Commit message (Collapse)AuthorAgeFilesLines
* Do not modify environment for user applicationsEike Ziller2018-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We used to set QT_OPENGL, currently set LD_LIBRARY_PATH when qtcreator.sh is used, and might set other variables in the future, but these environment modifications should not be passed on to user applications or when we run tools that are not shipped with Qt Creator. For LD_LIBRARY_PATH there already was a hack for Environment::systemEnvironment. For environment variables that we might set in main() in the future, this patch caches the system environment for Environment::systemEnvironment early before any modifications are made. The previous hack for LD_LIBRARY_PATH no longer works, since it used QCoreApplication::applicationDirPath() which cannot be used at that point in time (before the QApplication has been created). Instead pass the correct user LD_LIBRARY_PATH directly from qtcreator.sh to Qt Creator through a command line option, which is cleaner anyhow. Task-number: QTCREATORBUG-20808 Change-Id: I6674a5e0537e1b37fd7dcbff371b542fa24bce69 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* don't detect readlink a-prioriOswald Buddenhagen2016-09-271-6/+5
| | | | | | | | | | | 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>
* fix hand-crafted symlink resolutionOswald Buddenhagen2016-09-271-1/+1
| | | | | | | | 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>
* Fix qtcreator.sh for the new Qt deployment necessary with Qt 5.6Eike Ziller2016-02-221-1/+11
| | | | | | | | | | | 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>
* re-add LD_LIBRARY_PATH scriptOswald Buddenhagen2011-08-181-0/+35
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>