summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-01-07 13:10:07 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-01-07 13:26:21 (GMT)
commite2f2765b52508515874edea7015c01eb95ff89be (patch)
treeadf60279022605ea8b2e1b2a00d84f2f0310b0a4 /qmake
parent60d27f4b9fd2dbed204260334b817ce41788cb3e (diff)
downloadQt-e2f2765b52508515874edea7015c01eb95ff89be.zip
Qt-e2f2765b52508515874edea7015c01eb95ff89be.tar.gz
Qt-e2f2765b52508515874edea7015c01eb95ff89be.tar.bz2
Separated "make run" and "make runonphone" targets
Reviewed-by: axis
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/symmake.cpp7
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;
}
}