diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-19 07:57:47 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-19 08:08:08 (GMT) |
| commit | 68177eeeecaabb46ab01326c268690fcde2ef367 (patch) | |
| tree | 01e3ad353f0c1ec917441ef3b831bfca9318ca80 /qmake/generators | |
| parent | df8d432997b834187fee5143936e7d5957f27096 (diff) | |
| download | Qt-68177eeeecaabb46ab01326c268690fcde2ef367.zip Qt-68177eeeecaabb46ab01326c268690fcde2ef367.tar.gz Qt-68177eeeecaabb46ab01326c268690fcde2ef367.tar.bz2 | |
Fix build break in Symbian
Fix this makefile syntax error when building Qt from root:
"makefile:60: *** target pattern contains no `%'. Stop."
Break was caused by having absolute path in $(MAKEFILE) variable, which
broke subdir targets.
Reviewed-by: Janne Koskinen
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 0ba1a3c..7e3fb45 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -199,7 +199,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool t << "# ==============================================================================" << "\n" << endl; t << endl; - t << "MAKEFILE = " << wrapperFile.fileName() << endl; + t << "MAKEFILE = " << fileInfo(wrapperFile.fileName()).fileName() << endl; t << "QMAKE = " << var("QMAKE_QMAKE") << endl; t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 3a6706a..feacbef 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -143,7 +143,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo t << "#" << endl; t << "# ==============================================================================" << "\n" << endl; t << endl; - t << "MAKEFILE = " << wrapperFile.fileName() << endl; + t << "MAKEFILE = " << fileInfo(wrapperFile.fileName()).fileName() << endl; t << "QMAKE = " << var("QMAKE_QMAKE") << endl; t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; |