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

Maemo: Deduce correct target file name for library template.

Browse Source
This commit is contained in:
ck
2010-05-05 09:12:25 +02:00
parent ec5661c1fb
commit 26e9569a6c
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,14 +254,22 @@ QString MaemoPackageCreationStep::localExecutableFilePath() const
->qt4Project()->rootProjectNode()->targetInformation();
if (!ti.valid)
return QString();
return QDir::toNativeSeparators(QDir::cleanPath(ti.workingDir
+ QLatin1Char('/') + ti.target));
+ QLatin1Char('/') + executableFileName()));
}
QString MaemoPackageCreationStep::executableFileName() const
{
return QFileInfo(localExecutableFilePath()).fileName();
const Qt4Project * const project
= qt4BuildConfiguration()->qt4Target()->qt4Project();
const TargetInformation &ti
= project->rootProjectNode()->targetInformation();
if (!ti.valid)
return QString();
return project->rootProjectNode()->projectType() == LibraryTemplate
? QLatin1String("lib") + ti.target + QLatin1String(".so")
: ti.target;
}
const MaemoToolChain *MaemoPackageCreationStep::maemoToolChain() const