From fa81b861ed810defef9f47f4d97526e6ce4f3dc2 Mon Sep 17 00:00:00 2001 From: kh1 Date: Fri, 16 Jul 2010 12:44:07 +0200 Subject: [PATCH] Fix building projects if MADDE is on a different drive then the project. Task-number: QTCREATORBUG-1649 Reviewed-by: ck --- .../qt-maemo/maemopackagecreationstep.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp index 219b9ab97da..20faa14faf4 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp @@ -146,9 +146,16 @@ bool MaemoPackageCreationStep::createPackage() colon = QLatin1String(";"); env.insert(key, path % QLatin1String("bin") % colon % env.value(key)); #endif + env.insert(key, targetRoot() % "/bin" % colon % env.value(key)); env.insert(key, path % QLatin1String("madbin") % colon % env.value(key)); - env.insert(QLatin1String("PERL5LIB"), path % QLatin1String("madlib/perl5")); + + QString perlLib = QDir::fromNativeSeparators(path % QLatin1String("madlib/perl5")); +#ifdef Q_OS_WIN + perlLib = perlLib.remove(QLatin1Char(':')); + perlLib = perlLib.prepend(QLatin1Char('/')); +#endif + env.insert(QLatin1String("PERL5LIB"), perlLib); const QString buildDir = buildDirectory(); env.insert(QLatin1String("PWD"), buildDir);