Changeset 846 for trunk/doc/src/deployment/deployment.qdoc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/deployment/deployment.qdoc (modified) (13 diffs)

trunk/doc/src/deployment/deployment.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
 **
 ** If you have questions regarding the use of this file, please contact
@@ -88 +74 @@
         \o {4,1} Qt's Libraries
     \row
-        \o \l {QtAssistant}
         \o \l {QAxContainer}
         \o \l {QAxServer}
         \o \l {QtCore}
-    \row
         \o \l {QtDBus}
+    \row
         \o \l {QtDesigner}
         \o \l {QtGui}
         \o \l {QtHelp}
-    \row
         \o \l {QtNetwork}
+    \row
         \o \l {QtOpenGL}
         \o \l {QtScript}
         \o \l {QtScriptTools}
-    \row
         \o \l {QtSql}
+    \row
         \o \l {QtSvg}
         \o \l {QtWebKit}
         \o \l {QtXml}
-    \row
         \o \l {QtXmlPatterns}
+    \row
         \o \l {Phonon Module}{Phonon}
         \o \l {Qt3Support}
-        \o
     \endtable
 
@@ -172 +156 @@
     \o WebKit is licensed under the GNU LGPL version 2 or later.
     This has implications for developers of closed source applications.
-    Please see \l{QtWebKit Module#License Information}{the QtWebKit module
+    Please see \l{WebKit in Qt#License Information}{the QtWebKit module
     documentation} for more information.
 
@@ -773 +757 @@
 
     to your .pro file. The \c embed_manifest_dll option is enabled by default.
+        The \c embed_manifest_exe option is NOT enabled by default.
 
     You can find more information about manifest files and side-by-side
@@ -778 +763 @@
     \l {http://msdn.microsoft.com/en-us/library/aa376307.aspx}{MSDN website}.
 
-    There are two ways to include the run time libraries: by bundling them
-    directly with your application or by installing them on the end-user's
-    system.
-
-    To bundle the run time libraries with your application, copy the directory
-
-    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 22
-
-    into the folder where your executable is, so that you are including a
-    \c Microsoft.VC80.CRT directory alongside your application's executable. If
-    you are bundling the runtimes and need to deploy plugins as well, you have
-    to remove the manifest from the plugins (embedded as a resource) by adding
-    the following line to the \c{.pro} file of the plugins you are compiling:
-
-    \snippet doc/src/snippets/code/doc_src_deployment.qdoc 23
-
-    \warning If you skip the step above, the plugins will not load on some
-    systems.
+    The correct way to include the runtime libraries with your application
+    is to ensure that they are installed on the end-user's system.
 
     To install the runtime libraries on the end-user's system, you need to
@@ -826 +795 @@
 
     \list 1
-    
+
         \o create a folder structure on the development computer that will match the target USB stick directory structure, for example '\\app' and for your dlls, '\\app\\lib'.
-        
+
         \o on the development computer, from the appropriate 'redist' folder copy over Microsoft.VC80.CRT and Microsoft.VC80.MFC to the directories '\\app' and '\\app\\lib' on the development PC.
-        
+
         \o xcopy the \\app folder to the target USB stick.
     \endlist
@@ -933 +902 @@
 
     "C:/customPath/plugins " 
-    "C:/Qt/4.6.3/plugins" 
+    "C:/Qt/4.7.2/plugins" 
     "E:/myApplication/directory/"
 
@@ -1475 +1444 @@
 
     \note If you want a 3rd party library to be included in your
-    application bundle, then you must add an excplicit lib entry for
-    that library to your application's .pro file.  Otherwise, the
-    \c macdeployqt tool will not copy the 3rd party .dylib into the
-    bundle.
+    application bundle, then you must copy the library into the
+    bundle manually, after the bundle is created.
 
     \c macdeployqt supports the following options:
@@ -1491 +1458 @@
     \page deployment-symbian.html
     \contentspage Deploying Qt Applications
-
-    \title Deploying an Application on the Symbian platform
+    \ingroup qtsymbian
+    \title Deploying an Application on the Symbian Platform
+
+    \section1 Overview
 
     Applications are deployed to Symbian devices in signed \c .sis package files.
@@ -1502 +1471 @@
     typically needed and how to implement them.
 
+    \section1 Requirements
+
+    Download the latest release of the Smart Installer from
+    \l{http://get.qt.nokia.com/nokiasmartinstaller/}, and install it on top
+    of the Qt package.
+
     \section1 Static Linking
 
-    Qt for the Symbian platform does currently not support static linking of
-    Qt libraries.
+    Qt for the Symbian platform does not currently support static linking of
+    Qt libraries with application binaries. You will need to build shared
+    libraries as described below and link your application with them.
 
     \section1 Shared Libraries
@@ -1551 +1527 @@
 
     Now we are ready to compile the application and create the application
-    deployment file. Run \c qmake to create Symbian specific makefiles, resources (\.rss)
+    deployment file. Run \c qmake to create Symbian specific makefiles, resources (\c .rss)
     and deployment packaging files (\c .pkg). And do build to create the
     application binaries and resources.
@@ -1581 +1557 @@
     \l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}.
 
+    \section1 Further Reading
+
+    This document aims to cover the common case for developers who want to
+    deploy Qt applications on devices using the Smart Installer. It does not
+    aim to cover every possible way of installing applications, Qt and other
+    dependencies on a device.
+
+    A wider selection of deployment methods is described in the
+    \l{Deploying a Qt Application article} on the Symbian Foundation
+    Developer Wiki.
 */