summaryrefslogtreecommitdiffstats
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
parent60d27f4b9fd2dbed204260334b817ce41788cb3e (diff)
downloadQt-e2f2765b52508515874edea7015c01eb95ff89be.zip
Qt-e2f2765b52508515874edea7015c01eb95ff89be.tar.gz
Qt-e2f2765b52508515874edea7015c01eb95ff89be.tar.bz2
Separated "make run" and "make runonphone" targets
Reviewed-by: axis
-rw-r--r--doc/src/platforms/symbian-introduction.qdoc28
-rw-r--r--qmake/generators/symbian/symmake.cpp7
2 files changed, 23 insertions, 12 deletions
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 477e629..4d06bbc 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -124,12 +124,8 @@
\row \o \c release-gcce \o Build release binaries for hardware using GCCE.
\row \o \c debug-armv5 \o Build debug binaries for hardware using RVCT.
\row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
- \row \o \c run \o Run the application. Environment variable
- \c QT_SIS_TARGET (see below) can be used to specify which
- build target is run. By default it is the last build target.
- Note that running the application on real device
- using this command requires \c TRK application to be running
- on the device.
+ \row \o \c run \o Run the application on the emulator.
+ \row \o \c runonphone \o Run the application on a device.
\row \o \c sis \o Create signed \c .sis file for project.
\endtable
@@ -199,4 +195,24 @@
with the \c QT_SIS_OPTIONS=-i, like this:
\snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 5
+
+ \section1 Running applications from command line
+
+ The application can be launched on the emulator using \c{make run} command.
+
+ The application can be launched on a device using \c{make runonphone} command.
+ When this command is invoked, a \c .sis file is first created as if \c{make sis}
+ command was invoked (see above for details).
+ \bold{Note:} Running the application on a device using this command requires
+ \c TRK application to be running on the device.
+
+ Additional environment variables that can be utilized with these commands are:
+ \table
+ \row \o \c QT_RUN_OPTIONS \o Any command line parameters you wish to pass
+ to your application.
+ \row \o \c QT_RUN_ON_PHONE_OPTIONS \o Options for runonphone application.
+ Execute \c runonphone from command line for
+ more information about available options.
+ \c{make runonphone} only.
+ \endtable
*/
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;
}
}