From 878462f72e20f1cb207681ba172313a9872b7453 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Tue, 1 Jun 2010 17:38:15 +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
(cherry picked from commit 0017103863bc79f7f12eb60bb9e64812f9ffa22a)
(cherry picked from commit 9f8da8aa193088097ca0f5996cfa184d2476b30a)
---
.../qt4projectmanager/qt-maemo/maemotoolchain.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
index d5103bc495e..8f64513b1e3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
@@ -60,10 +60,15 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(maddeRoot())));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(targetRoot())));
-#ifdef Q_OS_WIN
+
+ // 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())));
-#endif
+ env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madlib")
+ .arg(maddeRoot())));
+ env.prependOrSet(QLatin1String("PERL5LIB"),
+ QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot())));
}
QString MaemoToolChain::makeCommand() const
--
GitLab