feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.5' into master

Browse Source 
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
This commit is contained in:
Orgad Shaneh
2017-10-17 20:00:44 +03:00
parent 5c554c0de9 aa4e05f07b
commit 371b2bbbab
128 changed files with 412 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -125,8 +125,7 @@ ToolChainConfigWidget *QnxToolChain::configurationWidget()
void QnxToolChain::addToEnvironment(Environment &env) const
{
if (env.value(QLatin1String("QNX_HOST")).isEmpty()
|| env.value(QLatin1String("QNX_TARGET")).isEmpty())
if (env.value("QNX_HOST").isEmpty() || env.value("QNX_TARGET").isEmpty())
setQnxEnvironment(env, QnxUtils::qnxEnvironment(m_sdpPath));
GccToolChain::addToEnvironment(env);