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)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
index d5103bc..8f64513 100644 (file)
--- 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