Merge branch 'master' into 4.6

4 files changed, 58 insertions, 14 deletions

diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
index 24f7817..41a0268 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/s60-introduction.qdoc
@@ -90,6 +90,7 @@
     \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 emulator binaries from the build directory.
+    \row \o \c sisx          \o Create signed \c .sis file for project.
     \endtable
 
     The following lines perform a debug build for the emulator
@@ -102,16 +103,47 @@
 
     \section1 Installing your own applications
 
-    To install your own applications on hardware, Qt comes with a tool called
-    \c createpackage. When used on the \c .pkg files created by qmake, it
-    will produce a signed \c .sis file that can be installed to the device. For
-    example:
-
+    To install your own applications on hardware, you need signed \c .sis file.
+    The signed \c .sis file can be created with \c make \c sisx target. \c sisx target
+    is only supported for executables or projects with \c DEPLOYMENT statements.
+    By default the \c sisx target will create signed \.sis file for last build
+    target. For example, the following sequence will generate the needed makefiles, 
+    build the project for \c debug-winscw and \c release-armv5, and create 
+    self-signed \c .sis file for \c release-armv5 target:
+    
     \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 2
 
+    If you want to use different certificate information or override the default
+    target for \c .sis file creation you can use the environment variables as 
+    shown in the table below:
+    
+    \table
+    \row \o \c QT_SISX_OPTIONS      \o Options accepted by \c .sis creation. 
+                                       Currently only -i, install the package right away 
+                                       using PC suite, is supported.
+                                       By default no otions are given.
+    \row \o \c QT_SISX_TARGET       \o Target for which \c .sis file is created.
+                                       Accepted values are build targets listed in 
+                                       previous table. By default last build target.
+    \row \o \c QT_SISX_CERTIFICATE  \o The certificate file used for signing.
+                                       By default self-signed certificate. 
+    \row \o \c QT_SISX_KEY          \o The certificate's private key file.
+                                       By default key is associated to self-signed certificate. 
+    \row \o \c QT_SISX_PASSPHRASE   \o The certificate's private key file's passphrase.
+                                       By default empty. 
+    \endtable    
+    
+    The environment variables for \c make can be given as an parameters. For example:
+    
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3    
+    
+    The above example is identical to:
+    
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 4        
+    
     If you want to install the program immediately, make sure that the device
-    is connected to the computer in "PC Suite" mode, and run \c createpackage
-    with the \c -i switch, like this:
+    is connected to the computer in "PC Suite" mode, and run \c sisx target
+    with the \c QT_SISX_OPTIONS=-i, like this:
 
-    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 5
 */
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 68cd19a..6df0a1d 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -170,7 +170,7 @@ nmake
 
 //! [23]
 cd \Qt\%VERSION%
-configure -platform win32-mwc -xplatform symbian-abld
+configure -platform win32-g++ -xplatform symbian-abld
 //! [23]
 
 
@@ -197,10 +197,10 @@ make release-armv5
 
 //! [29]
 cd src\s60installs
-createpackage -i qt_libs_armv5_urel.pkg <certificate file> <certificate key file>
+make sisx QT_SISX_OPTIONS=-i QT_SISX_CERTIFICATE=<certificate file> QT_SISX_KEY=<certificate key file>
 //! [29]
 
 //! [30]
 cd embedded\fluidlauncher
-createpackage -i fluidlauncher_armv5_urel.pkg
+make sisx QT_SISX_OPTIONS=-i
 //! [30]
diff --git a/doc/src/snippets/code/doc_src_s60-introduction.qdoc b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
index ff1d159..fa9fd45 100644
--- a/doc/src/snippets/code/doc_src_s60-introduction.qdoc
+++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
@@ -8,9 +8,21 @@
 //! [1]
 
 //! [2]
-    createpackage wiggly_gcce_udeb.pkg
+    qmake
+    make debug-winscw release-armv5
+    make sisx
 //! [2]
 
 //! [3]
-    createpackage -i wiggly_gcce_udeb.pkg
+   make sisx QT_SISX_TARGET=debug-armv5
 //! [3]
+
+//! [4]
+   set QT_SISX_TARGET=debug-armv5
+   make sisx
+//! [4]
+
+//! [5]
+   set QT_SISX_OPTIONS=-i
+   make sisx
+//! [5]
\ No newline at end of file
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 48fc8ef..3aa3c7b 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -1649,7 +1649,7 @@ void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t)
 
     t << OK_SISX_TARGET ":" << endl;
 
-    QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(QT_SISX_TARGET) " \
+    QString pkgcommand = QString("\tcreatepackage.bat $(QT_SISX_OPTIONS) %1_template.%2 $(QT_SISX_TARGET) " \
                                  "$(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)")
                           .arg(fixedTarget)
                           .arg("pkg");