diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-06 12:44:12 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-06 14:33:34 +0300 |
commit | 5988d0dfcca6374f7bc06bad3ec9e3a3b8ebc22f (patch) | |
tree | bbac9315bc9f1d8fccf1b7f07fc2566302327cf8 /qmake/generators/symbian/symmake_abld.cpp | |
parent | 0210bbbd7bf8254be5f7f19f524068cd39fc34c2 (diff) |
Rename Symbian generated mmp/mk files to include target in filename
Mmp and mk files previously contained UID3 as unique identifier in
the filename. However, this was not particularly useful for building
subprojects in massive project trees such as Qt, as it was difficult
to remember UID for each subproject. Now with intuitive naming of mmps,
it is possible to build a subproject like this:
sbs -c armv6_urel -p qtcore_dll.mmp
Task-number: QTBUG-12715
Reviewed-by: Jason Barron
Diffstat (limited to 'qmake/generators/symbian/symmake_abld.cpp')
-rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index d60528bd2f..c896ac641d 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -70,10 +70,6 @@ SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { } void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); - QFile ft(gnuMakefileName); if (ft.open(QIODevice::WriteOnly)) { generatedFiles << ft.fileName(); @@ -471,9 +467,8 @@ void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool ad // Normally emulator deployment gets done via regular makefile, but since subdirs // do not get that, special deployment only makefile is generated for them if needed. if (targetType != TypeSubdirs || addDeploymentExtension) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); + gnuMakefileName = QLatin1String("Makefile_") + fileInfo(mmpFileName).completeBaseName() + + QLatin1String(".mk"); t << "gnumakefile " << gnuMakefileName << endl; } } |