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

Maemo: By default, strip release binaries.

Browse Source 
But never strip debug binaries.

Task-number: QTCREATORBUG-2981
This commit is contained in:
Christian Kandeler
2010-11-02 16:15:56 +01:00
parent 22f03cbde6
commit 667d645611
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,8 +159,8 @@ bool MaemoPackageCreationStep::createPackage(QProcess *buildProc)
emit addOutput(tr("Creating package file ..."), MessageOutput);
checkProjectName();
QString error;
if (!preparePackagingProcess(buildProc, maemoToolChain(), buildDirectory(),
&error)) {
if (!preparePackagingProcess(buildProc, qt4BuildConfiguration(),
buildDirectory(), &error)) {
raiseError(error);
return false;
}
@@ -488,8 +488,14 @@ void MaemoPackageCreationStep::raiseError(const QString &shortMsg,
}
bool MaemoPackageCreationStep::preparePackagingProcess(QProcess *proc,
const MaemoToolChain *tc, const QString &workingDir, QString *error)
const Qt4BuildConfiguration *bc, const QString &workingDir, QString *error)
{
const MaemoToolChain * const tc
= dynamic_cast<const MaemoToolChain *>(bc->toolChain());
if (!tc) {
*error = tr("Build configuration has no Maemo toolchain.");
return false;
}
QFile configFile(tc->targetRoot() % QLatin1String("/config.sh"));
if (!configFile.open(QIODevice::ReadOnly)) {
*error = tr("Cannot open MADDE config file '%1'.")
@@ -511,6 +517,15 @@ bool MaemoPackageCreationStep::preparePackagingProcess(QProcess *proc,
env.insert(key, tc->targetRoot() % "/bin" % colon % env.value(key));
env.insert(key, path % QLatin1String("madbin") % colon % env.value(key));
if (bc->qmakeBuildConfiguration() & QtVersion::DebugBuild) {
const QLatin1String debOptionsKey("DEB_BUILD_OPTIONS");
QString debOptions = env.value(debOptionsKey);
if (!debOptions.isEmpty())
debOptions += QLatin1Char(' ');
debOptions += QLatin1String("nostrip");
env.insert(debOptionsKey, debOptions);
}
QString perlLib
= QDir::fromNativeSeparators(path % QLatin1String("madlib/perl5"));
#ifdef Q_OS_WIN