feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix building projects if MADDE is on a different drive then the project.

Browse Source 
Task-number: QTCREATORBUG-1649
Reviewed-by: ck
This commit is contained in:
kh1
2010-07-16 12:44:07 +02:00
parent 2b3db20507
commit fa81b861ed
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View File

@@ -146,9 +146,16 @@ bool MaemoPackageCreationStep::createPackage()
colon = QLatin1String(";"); colon = QLatin1String(";");
env.insert(key, path % QLatin1String("bin") % colon % env.value(key)); env.insert(key, path % QLatin1String("bin") % colon % env.value(key));
#endif #endif
env.insert(key, targetRoot() % "/bin" % colon % env.value(key)); env.insert(key, targetRoot() % "/bin" % colon % env.value(key));
env.insert(key, path % QLatin1String("madbin") % 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(); const QString buildDir = buildDirectory();
env.insert(QLatin1String("PWD"), buildDir); env.insert(QLatin1String("PWD"), buildDir);