diff options
| author | axis <qt-info@nokia.com> | 2010-02-23 15:23:05 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-23 15:23:05 (GMT) |
| commit | f67062af3a076468442c29127cb48bb13937ce0e (patch) | |
| tree | a12cd4c644fb528dd5f95cb58559732a0b8b6311 /qmake/generators/symbian/symmake.cpp | |
| parent | a670009fd378d48ff891602ec31204614e8a476f (diff) | |
| parent | c15307e9e916aa613096275919ca91deba64454f (diff) | |
| download | Qt-f67062af3a076468442c29127cb48bb13937ce0e.zip Qt-f67062af3a076468442c29127cb48bb13937ce0e.tar.gz Qt-f67062af3a076468442c29127cb48bb13937ce0e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/features/symbian/qt.prf
qmake/Makefile.unix
qmake/Makefile.win32
qmake/Makefile.win32-g++
qmake/Makefile.win32-g++-sh
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/src.pro
Diffstat (limited to 'qmake/generators/symbian/symmake.cpp')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 75b9a6d..5283bfa 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -49,11 +49,8 @@ #include <stdlib.h> #include <qdebug.h> -#ifdef Q_OS_WIN -#define SCRIPT_EXT ".bat" -#else -#define SCRIPT_EXT ".sh" -#endif +// Included from tools/shared +#include <symbian/epocroot.h> #define RESOURCE_DIRECTORY_MMP "/resource/apps" #define REGISTRATION_RESOURCE_DIRECTORY_HW "/private/10003a3f/import/apps" @@ -1038,7 +1035,7 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy removeSpecialCharacters(bldinfDefine); t << "#ifndef " << bldinfDefine << endl; - t << "\t#include \"" << QDir::toNativeSeparators(bldinfFilename) << "\"" << endl; + t << "\t#include \"" << bldinfFilename << "\"" << endl; t << "#endif // " << bldinfDefine << endl; } |