From 87fc59e087b515062b0e54b55603910591a8fc27 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 1 Apr 2011 10:37:57 +0200 Subject: [PATCH] Maemo: Re-order some environment settings for extra safety. Probably not needed here, but can't hurt either. --- src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp index 44ccaa87ddc..905d7956365 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp @@ -96,9 +96,6 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) const { QtVersion *v = QtVersionManager::instance()->version(m_qtVersionId); 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 env.prependOrSet(QLatin1String("SYSROOT_DIR"), QDir::toNativeSeparators(sysroot())); @@ -109,6 +106,10 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) const env.prependOrSet(QLatin1String("PERL5LIB"), 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"); if (!env.hasKey(manglePathsKey)) { const QStringList pathsToMangle = QStringList() << QLatin1String("/lib")