diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
| commit | 0a5bcc8a0ab57becc36b140954b7034b3d11efbc (patch) | |
| tree | 2310a77cf20d10609603c04f7d1bf29e9aec8042 /qmake | |
| parent | 4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff) | |
| parent | 83e321747920c31d6fa4c860de3683630fbedb5d (diff) | |
| download | Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.zip Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.gz Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
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 b84f0f1..76ff7fe 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1988,7 +1988,7 @@ void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QS t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; } t << "runonphone: sis" << endl; - t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << "_$(QT_SIS_TARGET).sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; + t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << ".sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; t << endl; } } |