diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
| commit | 22796b38c3a7dbcdb540e4c58e645b0267fe360c (patch) | |
| tree | dab9604e944d0184249ac2dceca7b6b16adba39e /qmake/generators | |
| parent | b958102dfa36a3554911adb8fdb21375f0ecb48c (diff) | |
| parent | bf71ab63e805e49e59fbe25265104a414ab7d039 (diff) | |
| download | Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.zip Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.gz Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index b2709d1..81f2d15 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1857,16 +1857,11 @@ void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QS // create execution targets if (targetType == TypeExe) { if (platforms.contains("winscw")) { - t << "ifeq (\"DEBUG-winscw\", \"$(QT_SIS_TARGET)\")" << endl; t << "run:" << endl; t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; - t << "else" << endl; } - t << "run: sis" << endl; + t << "runonphone: sis" << 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; - } t << endl; } } |