diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-08 07:21:24 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-08 07:43:51 (GMT) |
| commit | 22714feea0c0be10fc42ca44b2d539636dbb6f50 (patch) | |
| tree | 775459c8bfc2d6b6257b58f36804a4fa52a0e5ea | |
| parent | 3d247e0ae09bcd1b75f92a587ab5b28569a3f0f6 (diff) | |
| download | Qt-22714feea0c0be10fc42ca44b2d539636dbb6f50.zip Qt-22714feea0c0be10fc42ca44b2d539636dbb6f50.tar.gz Qt-22714feea0c0be10fc42ca44b2d539636dbb6f50.tar.bz2 | |
Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
Renaming makefile makes little sense for Symbian toolchains, when
we generate so many other files filenames derived from other sources.
Task-number: QTBUG-13336
Reviewed-by: Janne Anttila
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 44658bc..f4becf8 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1693,6 +1693,8 @@ for building a project. The value of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. + \bold{Note:} On the Symbian platform, this variable is ignored. + \target MAKEFILE_GENERATOR \section1 MAKEFILE_GENERATOR diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index cf6bd13..0b0033a 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -272,7 +272,8 @@ void SymbianMakefileGenerator::init() project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS")); project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE")); - // bld.inf + // Disallow renaming of bld.inf. + project->values("MAKEFILE").clear(); project->values("MAKEFILE") += BLD_INF_FILENAME; // .mmp |