diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-04 21:15:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-04 21:15:02 (GMT) |
| commit | 741a5b0cef49c70c8c5da2481e996399e81aaf63 (patch) | |
| tree | 3650ea09c26e5b7b018e9b814ff05c8e97dd2c41 /qmake | |
| parent | 4c486619517cea4012a157995bce197c817d83e5 (diff) | |
| parent | 0e94349de0b602f1b6af747b66ef03b22133cc3a (diff) | |
| download | Qt-741a5b0cef49c70c8c5da2481e996399e81aaf63.zip Qt-741a5b0cef49c70c8c5da2481e996399e81aaf63.tar.gz Qt-741a5b0cef49c70c8c5da2481e996399e81aaf63.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Deal with test cases that crash or hang
Updated sis file names and related content in Symbian installation docs
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index ddda848..f3339af 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1866,7 +1866,7 @@ void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QS t << "else" << endl; } t << "run: sis" << endl; - t << "\trunonphone --sis " << fixedTarget << "_$(QT_SIS_TARGET).sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; + t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << "_$(QT_SIS_TARGET).sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; if (platforms.contains("winscw")) { t << "endif" << endl; } |