diff options
| -rw-r--r-- | bin/createpackage.bat | 63 | ||||
| -rw-r--r-- | doc/src/installation.qdoc | 120 | ||||
| -rw-r--r-- | doc/src/s60-introduction.qdoc | 14 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 5 | ||||
| -rw-r--r-- | src/gui/text/qfont.cpp | 1 |
5 files changed, 111 insertions, 92 deletions
diff --git a/bin/createpackage.bat b/bin/createpackage.bat index 1c6e94d..116d52b 100644 --- a/bin/createpackage.bat +++ b/bin/createpackage.bat @@ -1,5 +1,16 @@ @echo off +set installsigned_old=%installsigned% +set pkgfile_old=%pkgfile% +set basename_old=%basename% +set signsis1_old=%signsis1% +set signsis2_old=%signsis2% +set signsis3_old=%signsis3% +set unsigned_sis_name_old=%unsigned_sis_name% +set signed_sis_name_old=%signed_sis_name% +set scriptpath_old=%scriptpath% +set certificate_old=%certificate% + rem Help text if "%1"=="" ( echo Convenience script for creating signed packages you can install on your phone. @@ -13,14 +24,14 @@ if "%1"=="" ( ) if "%1"=="-i" ( - set installsisx=true + set installsigned=true set pkgfile=%2 set basename=%~n2 set signsis1=%3 set signsis2=%4 set signsis3=%5 ) else ( - set installsisx=false + set installsigned=false set pkgfile=%1 set basename=%~n1 set signsis1=%2 @@ -28,34 +39,37 @@ if "%1"=="-i" ( set signsis3=%4 ) +set unsigned_sis_name=%basename%_unsigned.sis +set signed_sis_name=%basename%.sis + +rem Get absolute path to this script +set scriptpath=%~dp0 + rem Check the .pkg actually exists. if not exist %pkgfile% ( echo Error: Package description file '%pkgfile%' does not exist. goto done ) -rem Get absolute path to this script -set scriptpath=%~dp0 - -rem Remove any existing .sis or .sisx packages -if exist %basename%.sis del %basename%.sis -if exist %basename%.sisx del %basename%.sisx +rem Remove any existing .sis packages +if exist %signed_sis_name% del %signed_sis_name% +if exist %unsigned_sis_name% del %unsigned_sis_name% rem Create .sis package -makesis %pkgfile% +makesis %pkgfile% %unsigned_sis_name% rem If no certificate is given, check default options if x%signsis1% == x ( rem If RnD certificate is not found, sign with self signed certificate if not exist %scriptpath%..\rd.cer ( set certificate=Self signed - signsis %basename%.sis %basename%.sisx %scriptpath%..\selfsigned.cer %scriptpath%..\selfsigned.key + signsis %unsigned_sis_name% %signed_sis_name% %scriptpath%..\selfsigned.cer %scriptpath%..\selfsigned.key goto install ) rem Sign with RnD certificate set certificate=RnD - signsis %basename%.sis %basename%.sisx %scriptpath%..\rd.cer %scriptpath%..\rd-key.pem + signsis %unsigned_sis_name% %signed_sis_name% %scriptpath%..\rd.cer %scriptpath%..\rd-key.pem ) else ( if x%signsis2% == x ( echo Custom certificate key file parameter missing. @@ -63,19 +77,30 @@ if x%signsis1% == x ( ) set certificate=%signsis1% - signsis %basename%.sis %basename%.sisx %signsis1% %signsis2% %signsis3% + signsis %unsigned_sis_name% %signed_sis_name% %signsis1% %signsis2% %signsis3% ) :install -if exist %basename%.sisx ( - echo Successfully created %basename%.sisx using certificate %certificate% - if "%installsisx%" == "true" ( - echo Installing %basename%.sisx... - call %basename%.sisx +if exist %signed_sis_name% ( + echo Successfully created %signed_sis_name% using certificate %certificate% + if "%installsigned%" == "true" ( + echo Installing %signed_sis_name%... + call %signed_sis_name% ) ) :cleanup -if exist %basename%.sis del %basename%.sis +if exist %unsigned_sis_name% del %unsigned_sis_name% + +:done -:done
\ No newline at end of file +set installsigned=%installsigned_old% +set pkgfile=%pkgfile_old% +set basename=%basename_old% +set signsis1=%signsis1_old% +set signsis2=%signsis2_old% +set signsis3=%signsis3_old% +set unsigned_sis_name=%unsigned_sis_name_old% +set signed_sis_name=%signed_sis_name_old% +set scriptpath=%scriptpath_old% +set certificate=%certificate_old% diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc index 697427d..13af50c 100644 --- a/doc/src/installation.qdoc +++ b/doc/src/installation.qdoc @@ -499,51 +499,15 @@ in the \l{Qt for Windows CE Requirements} document. We hope you will enjoy using Qt. Good luck! */ -/*! \page install-S60.html - -\title Installing Qt on S60 -\ingroup installation -\ingroup qts60 -\brief How to install Qt on S60. -\list 1 - \o Install needed IDE and SDKs - - Make sure you have the following installed on your development PC: - \list - \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher} - \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher} - \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}. - Install this to all S60 SDKs you plan to use Qt with. - \endlist - - Make sure you have the following plugins installed on your device. The packages can be found - in the S60 SDK where you installed Open C/C++: - \list - \o nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis - \o nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis - \o nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis - \endlist - - These instructions assume the above tools are installed and - that the enviroment variables for your compiler are set correctly. - - \note Users of \bold{S60 Platform SDK 3rd Edition FP1} also need special updates. The update can be found - \l{http://pepper.troll.no/s60prereleases/patches/}{here}. - - \o Depending on how you obtained the Qt for S60 release, follow the instructions in one of these pages: - \list - \o \l{Installing Qt on S60 binary package} - \o \l{Installing Qt on S60 source package} - \endlist -\endlist -*/ - /*! \page install-S60-installer.html -\title Installing Qt on S60 binary package -\ingroup installation +\title Installing Qt on S60 using binary package \ingroup qts60 \brief How to install Qt on S60 using the binary package. + +\note Qt for S60 has some requirements that are given in more detail +in the \l{Qt for S60 Requirements} document. + \list 1 \o Install Qt @@ -558,20 +522,19 @@ in the \l{Qt for Windows CE Requirements} document. We've included a subset of the Qt demos in this package for you to try out. An excellent starting point is the "fluidlauncher" demo. To run the demo on a real device, you first have to install - \c{qt_libs.sisx} and \c{fluidlauncher.sisx} found in the Qt installation - directory. In Windows Explorer right click on the \c{.sisx} files and select + \c{qt_libs.sis} and \c{fluidlauncher.sis} found in the Qt installation + directory. In Windows Explorer right click on the \c{.sis} files and select "Install with Nokia Application Installer" and follow the instructions. - To run the demos and examples on the emulator, you need to build them. + To run the demos and examples on the emulator, you need to build them first. Open the "Qt for S60 Command Prompt" from the Start menu and type: \snippet doc/src/snippets/code/doc_src_installation.qdoc 25 - After building, you can run demos and examples by navigating to - \c{%EPOCROOT%\Epoc32\release\winscw\udeb\} and starting any of the - Qt demos and examples located there. For example: + To run the demos on the emulator simply navigate to the directory of the demo + you want to see and run: - \snippet doc/src/snippets/code/doc_src_installation.qdoc 26 + \snippet doc/src/snippets/code/doc_src_installation.qdoc 27 For more information about building and running Qt programs on S60, see \l{S60 - Introduction to using Qt}. @@ -581,19 +544,21 @@ in the \l{Qt for Windows CE Requirements} document. \endlist */ -/*! \page install-S60-sources.html +/*! \page install-S60.html -\title Installing Qt on S60 source package +\title Installing Qt on S60 \ingroup installation \ingroup qts60 -\brief How to install Qt on S60 using the source package. +\brief How to install Qt on S60 -\list 1 +\note Qt for S60 has some requirements that are given in more detail +in the \l{Qt for S60 Requirements} document. - \o Install needed tools - - Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 616] or later, - which is not available free of charge. +\note This document describes how to install Qt for S60 from the source package. +Go \l{Installing Qt on S60 using binary package}{here} for instructions on how to install +Qt using binary package. + +\list 1 \o Install Qt @@ -656,19 +621,14 @@ in the \l{Qt for Windows CE Requirements} document. \snippet doc/src/snippets/code/doc_src_installation.qdoc 30 - This will create a self-signed \c fluidlauncher_armv5_urel.sisx and + This will create a self-signed \c fluidlauncher_armv5_urel.sis and install it to your device. - To run the demos on the emulator simply run: + To run the demos on the emulator simply navigate to the directory of the demo + you want to see and run: \snippet doc/src/snippets/code/doc_src_installation.qdoc 27 - Or, if you need to supply arguments to the program, navigate to - \c{%EPOCROOT%\Epoc32\release\winscw\udeb\} and start any of the - Qt demos located there, for example: - - \snippet doc/src/snippets/code/doc_src_installation.qdoc 26 - For more information about building and running Qt programs on S60, see \l{S60 - Introduction to using Qt}. @@ -700,6 +660,7 @@ in the \l{Qt for Windows CE Requirements} document. \list \o \l{Qt for Embedded Linux Requirements} \o \l{Qt for Mac OS X Requirements} + \o \l{Qt for S60 Requirements} \o \l{Qt for Windows CE Requirements} \o \l{Qt for Windows Requirements} \o \l{Qt for X11 Requirements} @@ -933,3 +894,34 @@ in the \l{Qt for Windows CE Requirements} document. enables the use of the Record extension to the X protocol to be used in applications. */ + +/*! + \page requirements-s60.html + \title Qt for S60 Requirements + \ingroup installation + \brief Setting up the S60 environment for Qt. + \previouspage General Qt Requirements + + Qt for S60 requires the following software installed on your development PC: + \list + \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher} + \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher} + \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}. + Install this to all S60 SDKs you plan to use Qt with. + \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 616] or later, + which is not available free of charge. + \endlist + + Running Qt on real device requires the following packages to be installed on your device. + The packages can be found in the S60 SDK where you installed Open C/C++: + \list + \o \c{nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis} + \o \c{nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis} + \o \c{nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis} + \endlist + + \note Users of \bold{S60 Platform SDK 3rd Edition FP1} also need special updates. The update can be found + \l{http://pepper.troll.no/s60prereleases/patches/}{here}. + + \sa {Known Issues in %VERSION%} +*/ diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc index af67a8a..537b37d 100644 --- a/doc/src/s60-introduction.qdoc +++ b/doc/src/s60-introduction.qdoc @@ -49,9 +49,17 @@ \tableofcontents - \section1 Installing Qt + \section1 Required tools + + See \l{Qt for S60 Requirements} to see what tools are required to use Qt for S60. - Follow the instructions found in \l{Installing Qt on S60}. + \section1 Installing Qt and running demos + + Follow the instructions found in \l{Installing Qt on S60 using binary package} to learn how + to install Qt using binary package and how to build and run Qt demos. + + Follow the instructions found in \l{Installing Qt on S60} to learn how to install Qt using + using source package and how to build and run the Qt demos. \section1 Building your own applications @@ -96,7 +104,7 @@ 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 \c .sisx file that can be installed to the device. For + will produce a signed \c .sis file that can be installed to the device. For example: \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 2 diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index d698f4a..489016d 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -146,11 +146,6 @@ qmake make //! [25] - -//! [26] -wiggly.exe -small-screen -//! [26] - //! [27] make run //! [27] diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 930e8af..dd50d12 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -796,7 +796,6 @@ QFont::QFont(const QString &family, int pointSize, int weight, bool italic) if (pointSize <= 0) { #ifdef Q_WS_S60 - // TODO: What should the default QFont pointSize for Q_WS_S60 be? pointSize = 7; #else pointSize = 12; |