Changeset 769 for trunk/doc/src/development/qmake-manual.qdoc

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/development/qmake-manual.qdoc (modified) (9 diffs)

trunk/doc/src/development/qmake-manual.qdoc

@@ -859 +859 @@
     XCode build system.
 
-    Furthermore, The selected "Active Build Configuration" is stored
+    Furthermore, the selected "Active Build Configuration" is stored
     in a .pbxuser file, which is generated by xcode on first load, not
     created by qmake.
@@ -980 +980 @@
     If \c UID3 is not specified, qmake will automatically generate a \c UID3
     suitable for development and debugging. This value should be manually
-    specified for applications that are to be released. In order to optain
+    specified for applications that are to be released. In order to obtain
     an official UID, please contact Nokia. Both \c SID and \c VID default to empty values.
 
@@ -1422 +1422 @@
     override languages statement, you must override also package-header
     statement and all other statements which are language specific.
+
+    On the Symbian platform, the \c default_deployment item specifies
+    default platform and package dependencies. Those dependencies can be
+    selectively disabled if alternative dependencies need to be defined
+    - e.g. if a specific device is required to run the application or
+    more languages need to be supported by the package file. The supported
+    \c default_deployment rules that can be disabled are:
     
-    On the Symbian platform, the \c default_deployment item specifies 
-    default platform dependencies. It can be overwritten if a more 
-    restrictive set is needed - e.g. if a specific
-    device is required to run the application.
-    
+    \list
+    \o pkg_depends_qt
+    \o pkg_depends_webkit
+    \o pkg_platform_dependencies
+    \endlist
+
     For example:
     
@@ -1728 +1736 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 139
 
+    There is also a convenience function for adding conditional rules
+    called \c{addMMPRules}. Suppose you need certain functionality
+    to require different library depending on architecture. This
+    can be specified with \c{addMMPRules} as follows:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 148
+
     \note You should not use this variable to add MMP statements that are
-    explicitly supported by their own variables, such as 
+    explicitly supported by their own variables, such as
     \c TARGET.EPOCSTACKSIZE. 
     Doing so could result in duplicate statements in the MMP file.
@@ -2878 +2893 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 144
     
-    This will add the specified statement to the end of the generated 
-    registration resource file. As an impact of this statement, the application
-    will not be visible in application shell.
+    This will add the specified statement to the end of the \c APP_REGISTRATION_INFO
+    resource struct in the generated registration resource file.
+    As an impact of this statement, the application will not be visible in application shell.
     
     It is also possible to add multiple rows in a single block. Each double
@@ -2893 +2908 @@
     be launched in background.
 
-    For detailed list of possible RSS statements, please refer to the
-    Symbian platform help.    
+    For detailed list of possible \c APP_REGISTRATION_INFO statements, please refer to the
+    Symbian platform help.
 
     \note You should not use \c RSS_RULES variable to set the following RSS statements:
-    
-    app_file
-    localisable_resource_file
-    localisable_resource_id
-
-    These statements are internally handled by qmake.     
+    \c app_file, \c localisable_resource_file, and \c localisable_resource_id.
+
+    These statements are internally handled by qmake.
+
+    There is a number of special modifiers you can attach to \c RSS_RULES to specify where
+    in the application registration file the rule will be written:
+
+    \table
+    \header \o Modifier \o Location of the rule
+    \row \o <no modifier>        \o Inside \c APP_REGISTRATION_INFO resource struct.
+    \row \o .header              \o Before \c APP_REGISTRATION_INFO resource struct.
+    \row \o .footer              \o After \c APP_REGISTRATION_INFO resource struct.
+    \row \o .service_list        \o Inside a \c SERVICE_INFO item in the \c service_list
+                                 of \c APP_REGISTRATION_INFO
+    \row \o .file_ownership_list \o Inside a \c FILE_OWNERSHIP_INFO item in the
+                                 \c file_ownership_list of \c APP_REGISTRATION_INFO
+    \row \o .datatype_list       \o Inside a \c DATATYPE item in the \c datatype_list of
+                                 \c APP_REGISTRATION_INFO
+    \endtable
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 151
+
+    This example will define service information for a fictional service that requires
+    an icon to be supplied via the \c opaque_data of the service information.
 
     \target S60_VERSION
@@ -2961 +2996 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 51
+
+    It is possible to modify this default behavior of \c SUBDIRS by giving
+    additional modifiers to \c SUBDIRS elements. Supported modifiers are:
+
+    \table
+    \header \o Modifier \o Effect
+    \row \o .subdir     \o Use the specified subdirectory instead of \c SUBDIRS value.
+    \row \o .file       \o Specify the subproject \c pro file explicitly. Cannot be
+                        used in conjunction with \c .subdir modifier.
+    \row \o .condition  \o Specifies a \c bld.inf define that must be true for
+                        subproject to be built. Available only on Symbian platform.
+    \row \o .depends    \o This subproject depends on specified subproject.
+                        Available only on platforms that use makefiles.
+    \row \o .makefile   \o The makefile of subproject.
+                        Available only on platforms that use makefiles.
+    \row \o .target     \o Base string used for makefile targets related to this
+                        subproject.
+                        Available only on platforms that use makefiles.
+    \endtable
+
+    For example, define two subdirectories, both of which reside in a different directory
+    than the \c SUBDIRS value, and one of the subdirectories must be built before the other:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 149
+
+    For example, define a subdirectory that is only build for emulator builds in Qt for Symbian:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 150
 
     \target TARGET
@@ -3505 +3568 @@
     \section1 Properties
 
-    \c qmake has a system of persistant information, this allows you to
+    \c qmake has a system of persistent information, this allows you to
     \c set a variable in qmake once, and each time qmake is invoked this
     value can be queried. Use the following to set a property in qmake:
@@ -3683 +3746 @@
     dependent .prl files, continuing until all libraries have been resolved.
     At this point, the Makefile is created as usual, and the libraries are
-    linked explicitlyy against the application.
+    linked explicitly against the application.
 
     The internals of the .prl file are left closed so they can easily