From 9f8da8aa193088097ca0f5996cfa184d2476b30a Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 2 Jun 2010 10:38:18 +0200
Subject: [PATCH] Fix MADDE and pkg-config with QtCreator.
We missed some environment vars that had to be set to make the script
work. NOTE: still does not work on windows, since madbin\pkg-config.cmd
needs to be too.
Reviewed-by: kh
---
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
index cc9cababd1b..8f64513b1e3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
@@ -60,7 +60,8 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(maddeRoot())));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(targetRoot())));
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+
+ // put this into environment to make pkg-config stuff work
env.prependOrSet(QLatin1String("SYSROOT_DIR"), sysrootRoot());
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madbin")
.arg(maddeRoot())));
@@ -68,7 +69,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(maddeRoot())));
env.prependOrSet(QLatin1String("PERL5LIB"),
QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot())));
-#endif
}
QString MaemoToolChain::makeCommand() const
--
GitLab