diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-09 17:37:04 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-01 17:22:00 (GMT) |
| commit | ac323ef4e9d018aa9df41d8f7e81b58a3e373dbf (patch) | |
| tree | fbc543f812656e10f4e4bb6c78219027f5a2b5db /qmake | |
| parent | 55ca7d36d35c8ecac27b6866f40a5f2de799debd (diff) | |
| download | Qt-ac323ef4e9d018aa9df41d8f7e81b58a3e373dbf.zip Qt-ac323ef4e9d018aa9df41d8f7e81b58a3e373dbf.tar.gz Qt-ac323ef4e9d018aa9df41d8f7e81b58a3e373dbf.tar.bz2 | |
qmake: Remove macro and simplify string expression previously using it
also fixes a warning
Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 63676d1..caee2db 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -54,7 +54,6 @@ #define REGISTRATION_RESOURCE_DIRECTORY_HW "/private/10003a3f/import/apps" #define PLUGIN_COMMON_DEF_FILE_FOR_MMP "./plugin_common.def" #define PLUGIN_COMMON_DEF_FILE_ACTUAL "plugin_commonU.def" -#define BLD_INF_FILENAME_LEN (sizeof(BLD_INF_FILENAME) - 1) #define BLD_INF_RULES_BASE "BLD_INF_RULES." #define BLD_INF_TAG_PLATFORMS "prj_platforms" @@ -227,7 +226,9 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) QString wrapperFileName("Makefile"); QString outputFileName = fileInfo(Option::output.fileName()).fileName(); if (outputFileName != BLD_INF_FILENAME) { - wrapperFileName.append(".").append((outputFileName.size() > BLD_INF_FILENAME_LEN && outputFileName.left(BLD_INF_FILENAME_LEN) == BLD_INF_FILENAME) ? outputFileName.mid(8) : outputFileName); + wrapperFileName.append(".").append(outputFileName.startsWith(BLD_INF_FILENAME) + ? outputFileName.mid(sizeof(BLD_INF_FILENAME)) + : outputFileName); isPrimaryMakefile = false; } |