diff --git a/doc/examples/batteryindicator/mainwindow.h b/doc/examples/batteryindicator/mainwindow.h index b08e293fa30..a812ef84356 100644 --- a/doc/examples/batteryindicator/mainwindow.h +++ b/doc/examples/batteryindicator/mainwindow.h @@ -43,7 +43,7 @@ #include //! [1] -#include +#include //! [1] //! [2] diff --git a/doc/images/qmldesigner-tutorial-project.png b/doc/images/qmldesigner-tutorial-project.png index 50dd3a5929c..d1f945f9d6f 100644 Binary files a/doc/images/qmldesigner-tutorial-project.png and b/doc/images/qmldesigner-tutorial-project.png differ diff --git a/doc/images/remotecompiler-fn-logon.png b/doc/images/remotecompiler-fn-logon.png index 0e36d6d4863..fdce99dc3cc 100644 Binary files a/doc/images/remotecompiler-fn-logon.png and b/doc/images/remotecompiler-fn-logon.png differ diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc index 611d97f67df..391082272bc 100644 --- a/doc/maemodev.qdoc +++ b/doc/maemodev.qdoc @@ -59,13 +59,13 @@ For more information about developing applications for the Maemo 5 platform, select \gui {Help > Index} and look for \gui {Platform Notes}, or see - \l{http://doc.qt.nokia.com/qt-maemo-4.6/platform-notes.html}{Platform Notes - Maemo 5}. + \l{http://doc.qt.nokia.com/qt-maemo/platform-notes-maemo5.html}{Platform Notes - Maemo 5}. \section1 Hardware and Software Requirements To build and run Qt applications for Maemo 5, you need the following: \list - \o Nokia N900 device with software update release 1.2 (V10.2010.19-1) + \o Nokia N900 device with software update release 1.3 (V20.2010.36-2) or later installed. \if defined(qcmanual) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 4ff9ac0b72d..8e18c7b19a5 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -1741,6 +1741,7 @@ To paste a snippet of code onto the server, select \gui{Tools} > \gui{Code Pasting} > \gui{Paste Snippet...} or press \key{Alt+C,Alt+P}. + To fetch a snippet of code from the server, select \gui{Tools} > \gui{Code Pasting} > \gui{Fetch Snippet...} or press \key{Alt+C,Alt+F}. @@ -4079,8 +4080,8 @@ not supported on the development PC. You can choose from a set of supported devices, such as S60 3rd Edition or S60 5th Edition devices. - \note Remote Compiler is an experimental component that you must install - separately from the package that is included in the \QSDK. + \note Remote Compiler is an experimental component that is installed as + part of \QSDK. \list 1 @@ -4088,7 +4089,7 @@ \gui {Maintain \QSDK} tool. \o In the \gui {Package Manager}, select \gui {Experimental > - Remote Compiler}. + Remote Compiler} to install Remote Compiler. \o In Qt Creator, choose \gui {Tools > Options > Projects > Remote Compiler} to log on to Forum Nokia. @@ -4113,7 +4114,7 @@ the development PC. For more information about Remote Compiler, choose \gui {Help > Contents > - Remote Compiler}. The document is added during the installation of + Remote Compiler Manual}. The document is added during the installation of Remote Compiler. */ @@ -4557,7 +4558,8 @@ notifications and error messages. To create a SIS package without copying it to the device (for example, to submit it - to Ovi Signed or Symbian Signed), create a deploy configuration that contains only the + to \e {Application Signing Services for Ovi Store} or \e {Symbian Signed}), + create a deploy configuration that contains only the \gui {Create SIS Package} step. \image qtcreator-run-settings-create.png "Create SIS Package step" @@ -4580,21 +4582,21 @@ \endlist To get around these limitations, you need to go through the Symbian Signed - or Ovi Signed process. The Symbian Signed organisation manages a public key + or Application Signing Services for Ovi Store. The Symbian Signed organisation + manages a public key infrastructure to provide public authentication of the information in the application signing certificates. Their security partner can validate your certificate and give you a Publisher ID. Then, when you sign an application, other people can be confident that the information in your certificate is correct and that the application does actually come from you. - Ovi Signed is a variant of the Symbian Signed certification provided by Ovi + Application Signing Services for Ovi Store is a variant of the Symbian + Signed certification provided by Ovi Publishing. It is limited to the Basic and System capability sets (Express Signing). Participants can submit an unsigned SIS file to Ovi - Publishing for signing, quality assurance, packaging with Nokia Smart Installer - for Symbian, and publishing on Ovi Store. For more information about how - to participate and a list - of supported Nokia devices, see - \l{http://www.forum.nokia.com/Distribute/Packaging_and_signing.xhtml}{Packaging and Signing}. + Publishing for signing. For more information about how + to participate, see + {http://wiki.forum.nokia.com/index.php/Guide_to_Publishing_Qt_Applications_to_the_Ovi_Store}{Guide to Publishing Qt Applications to the Ovi Store}. There are also options that do not require you to get a Publisher ID. For more detail about how the Symbian Signed process works, see @@ -4674,13 +4676,14 @@ the necessary software and by installing the missing pieces. For this to work, the Nokia Smart Installer must be packaged with the Qt application. The - application SIS file must first be Symbian Signed or Ovi Signed. The capabilities used in the applications + application SIS file must first be Symbian Signed or signed by the Application + Signing Services for Ovi Store. The capabilities used in the applications determine, which signing option must be selected. The wrapper package must be signed using either the same option or a more extensive option than the application SIS. - \note If you use Ovi Signed, you can just submit an unsigned SIS file to Ovi Publishing. - Ovi signs the file for you and packages it with Nokia Smart Installer for Symbian. - For more information, see \l{Publishing Applications to Ovi Store}. + \note If you use the Application Signing Services for Ovi Store, you can submit an unsigned + wrapper package to Ovi Publishing. For more information, see + \l{Publishing Applications to Ovi Store}. You can either install the Nokia Smart Installer for Symbian as part of the \QSDK, or download and install it from the @@ -4881,39 +4884,21 @@ \title Publishing Applications to Ovi Store - To register as an Ovi Publisher, go to \l{https://publish.ovi.com/login}{Ovi Store}. + The process and requirements to publish Qt applications to Ovi Store are + described in the + \l {http://wiki.forum.nokia.com/index.php/Guide_to_Publishing_Qt_Applications_to_the_Ovi_Store}{Guide to Publishing Qt Applications to the Ovi Store} wiki. - At the time of writing this document, Ovi Store accepts Qt - applications for the following Nokia device models: - - \list - - \o Symbian^3: N8-00, E7-00, C7-00, C6-01 - - \o Symbian^1 (S60 5th Edition): X6-00, N97, N97 mini, 5800 XpressMusic, - 5530 XpressMusic, 5230 ExpressMusic, C6-00, 5228, 5235 - - \o S60 3rd Edition: E72, E71, E66, E63, E52 - - \o Maemo: Nokia N900, with PR1.3 and later - - \endlist - - For an up-to-date list, see - \l{http://www.forum.nokia.com/Distribute/Packaging_and_signing.xhtml}{Packaging and Signing}. - New devices are added to the list periodically. The final authority - on the supported devices is the Ovi Publish tool itself. + This section describes, how to use Qt Creator to generate SIS packages that + you can publish to Ovi Store. \section1 Publishing Qt Content for Symbian Devices - You can use the Ovi Signed process to get your application Express Signed for + You can use the \e {Application Signing Services for Ovi Store} to get your + application Express Signed for free by Nokia. Make sure to use the \l{Application UID}{application UID} that you receive from Ovi Publisher Support. Then create an unsigned SIS package and submit - it to Ovi Publishing for signing, quality assurance, packaging with Nokia Smart - Installer for Symbian, and publishing to Ovi Store. - - For more information about how to use Ovi Signed, see - \l{http://www.forum.nokia.com/Distribute/Packaging_and_signing.xhtml}{Packaging and Signing}. + it to signing. When you receive the signed package back, package it with + Nokia Smart Installer for Symbian before submitting it to Ovi Publishing. If the application uses functions that require advanced \l{Capabilities and Signing}{capabilities}, you must @@ -4972,7 +4957,32 @@ \o Choose \gui {Build > Run Project}. - \o Submit the SIS file to Ovi Publishing as a Qt Content item. + \o Submit the created .sis file to Application Signing Services for Ovi + Store for certification. + + \note Ensure that your application complies with the Ovi Store + publishing requirements. + + \o After receiving the signed .sis file from Ovi Publisher Support, + copy it over the old application.sis. + + \note The instructions below assume that you have installed \QSDK. + + \o To package Nokia Smart Installer for Symbian with the application, choose + \gui {Start > Qt SDK > Symbian > Qt for Symbian Command Prompt} + to open the Qt command line environment. + + \o Change to the project directory. For example: + + \c{cd C:\Sources\Application} + + \o To create a Smart Installer wrapper package, enter the following + command: + + \c {C:\Sources\Application> make ok_installer_sis QT_SIS_CERTIFICATE=publisherid.cer QT_SIS_KEY=publisherid.key} + + \o Submit the created wrapped .sis file, application_installer.sis, to + Ovi Publishing as a Qt Content item. \endlist @@ -5260,7 +5270,7 @@ \o In the \gui{Projects} view, double-click the \c{mainwindow.h} file to open it for editing. - \o Include the System Info header file, as illustrated by the following + \o Include the System Device Info header file, as illustrated by the following code snippet: \snippet examples/batteryindicator/mainwindow.h 1 @@ -10144,6 +10154,10 @@ \list + \o If you change the Input Languages in Windows, Qt Creator might not + respond for 30 seconds. This is a known issue in the Advanced Text + Service of Microsoft Windows. + \o Qt Creator uses SQLite for storing some of its settings. SQLite is known to have problems with certain NFS servers (most notably the nfs-user-server 2.2beta), since they can lock up the application diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 4073965af37..12b7832f563 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -2704,7 +2704,7 @@ Would you like to overwrite them? Shortcut - Сокращение + Комбинация клавиш Import Keyboard Mapping Scheme @@ -13315,7 +13315,7 @@ to project '%2'. Set as Startup Project - Сделать начальным проектом + Сделать активным проектом Open Build/Run Target Selector... diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp index 0abca1c266a..2e79c25c13e 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp @@ -110,6 +110,7 @@ RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runC } else { params.startMode = AttachToRemote; } + params.displayName = runConfig->displayName(); DebuggerRunControl * const runControl = DebuggerPlugin::createDebugger(params, runConfig);