diff options
| author | axis <qt-info@nokia.com> | 2010-03-18 08:57:42 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-18 08:57:42 +0100 |
| commit | d3cba714adb35098d515f7c4f8e90a4e38527d76 (patch) | |
| tree | 60018e4f20fc6b58017081b5e9e043d36a7ee3a9 /qmake/generators/symbian/symmake_abld.cpp | |
| parent | 09c2a804b700ec51f44bda567b806181d00bc161 (diff) | |
| parent | e483886bcfcf7252af9ac7cc89de15f912bf69da (diff) | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60
Conflicts:
qmake/generators/symbian/symmake_abld.cpp
Diffstat (limited to 'qmake/generators/symbian/symmake_abld.cpp')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index f05e7ff8f4..0ba1a3c835 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -204,6 +204,8 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; t << "MOVE = " << var("QMAKE_MOVE") << endl; + t << "CHK_DIR_EXISTS = " << var("QMAKE_CHK_DIR_EXISTS") << endl; + t << "MKDIR = " << var("QMAKE_MKDIR") << endl; #ifdef Q_OS_WIN32 t << "XCOPY = xcopy /d /f /h /r /y /i" << endl; t << "ABLD = ABLD.BAT" << endl; |