summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-28 06:45:59 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-28 06:45:59 (GMT)
commit92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b (patch)
treea41e36aa07c0db9efea4793f9fb849356da0a157 /qmake/generators
parent6ae0b4848526719b526443b853bc95aa85cb6cb9 (diff)
downloadQt-92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b.zip
Qt-92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b.tar.gz
Qt-92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b.tar.bz2
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
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/symbian/symmake_sbsv2.cpp5
1 files changed, 1 insertions, 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;