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

Maemo: Re-order some environment settings for extra safety.

Browse Source 
Probably not needed here, but can't hurt either.
This commit is contained in:
Christian Kandeler
2011-04-01 10:37:57 +02:00
parent afa13623cd
commit 87fc59e087
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
View File

@@ -96,9 +96,6 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) const
{ {
QtVersion *v = QtVersionManager::instance()->version(m_qtVersionId); QtVersion *v = QtVersionManager::instance()->version(m_qtVersionId);
const QString maddeRoot = MaemoGlobal::maddeRoot(v); const QString maddeRoot = MaemoGlobal::maddeRoot(v);
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin").arg(maddeRoot)));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(MaemoGlobal::targetRoot(v))));
// put this into environment to make pkg-config stuff work // put this into environment to make pkg-config stuff work
env.prependOrSet(QLatin1String("SYSROOT_DIR"), QDir::toNativeSeparators(sysroot())); env.prependOrSet(QLatin1String("SYSROOT_DIR"), QDir::toNativeSeparators(sysroot()));
@@ -109,6 +106,10 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) const
env.prependOrSet(QLatin1String("PERL5LIB"), env.prependOrSet(QLatin1String("PERL5LIB"),
QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot))); QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot)));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin").arg(maddeRoot)));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(MaemoGlobal::targetRoot(v))));
const QString manglePathsKey = QLatin1String("GCCWRAPPER_PATHMANGLE"); const QString manglePathsKey = QLatin1String("GCCWRAPPER_PATHMANGLE");
if (!env.hasKey(manglePathsKey)) { if (!env.hasKey(manglePathsKey)) {
const QStringList pathsToMangle = QStringList() << QLatin1String("/lib") const QStringList pathsToMangle = QStringList() << QLatin1String("/lib")