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

Merge commit origin/2.0 '1a985148340ff3b29c752036857446452cf0907f'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/settingspage.ui
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
This commit is contained in:
con
2010-07-26 12:26:05 +02:00
parent 91b6d329fe 1a98514834
commit 39a8e97775
17 changed files with 241 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,9 +144,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);