From 92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 28 Aug 2009 09:45:59 +0300 Subject: Minor fix to MAKEFILE variable in SBSv2 generated makefiles. MAKEFILE variable pointed to root bld.inf from which makefile was generated but it shoudl contain the makefile name instead. This is how it work in abld generator. Reviewed-by: TrustMe --- qmake/generators/symbian/symmake_sbsv2.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 8b38f3b..9891a2e 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -123,10 +123,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo t << "#" << endl; t << "# ==============================================================================" << "\n" << endl; t << endl; - QString ofile = Option::fixPathToTargetOS(Option::output.fileName()); - if (ofile.lastIndexOf(Option::dir_sep) != -1) - ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) - 1); - t << "MAKEFILE = " << ofile << endl; + t << "MAKEFILE = " << wrapperFile.fileName() << endl; t << "QMAKE = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl; t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; -- cgit v0.12