Merge "Merge remote-tracking branch 'origin/2.2'"

doc/qtcreator.qdoc

@@ -5377,6 +5377,9 @@
 
     \list 1
 
+        \o Select \gui Projects to select the Qt version to build the
+        application. For more information, see \l{Supported Configurations}.
+
         \o Select the \gui {Symbian Device} build target for your project.
 
         \o Choose \gui {Build > Publish Project}.
@@ -5418,6 +5421,72 @@
     application access not granted.} For example, if you try to install a
     self-signed application that uses a system capability.
 
+    \section2 Supported Configurations
+
+    When you select the Qt version to build the application with, consider
+    which version provides the application with the widest support on different
+    Symbian platforms. The binary compatibility promise of Qt and Symbian means
+    that applications that are built against Qt 4.6.3 also run on Qt 4.7.3.
+    Similarly, applications that are supported on Symbian^1 are also supported
+    on Symbian^3. However, dependencies, such as QML or Qt Mobility API
+    versions might restrict the choice of Qt versions that you have.
+
+    In general, if you use only Qt widgets and APIs in the application, you
+    can use \gui {Qt 4.6.3 for Symbian^1} to build it.
+    The application is supported on both Symbian^1 and Symbian^3 devices.
+
+    If you use QML in the application, you can use \gui {Qt 4.7.3 for
+    Symbian^1} to build it. The application is supported on both Symbian^1 and
+    Symbian^3 devices.
+
+    If you use native Symbian APIs, you must check that they are available on
+    the target devices. For more information about the API differences between
+    Symbian^1 (S60 5th Edition) and Symbian^3, see the \bold {Symbian
+    Reference Documentation for Qt}, which is delivered together with \QSDK
+    and which you can view in the \gui Help mode.
+
+    The following table summarizes the supported configurations for each Qt
+    version available in Qt Creator build settings:
+
+    \table
+        \header
+            \i  Qt Version
+            \i  QML
+            \i  Qt Mobility Version
+            \i  Native Symbian C++ APIs
+            \i  Open GL
+        \row
+            \i  Qt 4.6.3 for S60 3rd Edition
+            \i  No
+            \i  1.0.2
+            \i  No
+            \i  No
+        \row
+            \i  Qt 4.6.3 for Symbian^1 (S60 5th Edition)
+            \i  No
+            \i  1.0.2
+            \i  No
+            \i  No
+        \row
+            \i  Qt 4.6.3 for Symbian^3
+            \i  No
+            \i  1.0.2
+            \i  Yes
+            \i  No
+        \row
+            \i  Qt 4.7.3 for Symbian^1
+            \i  Yes
+            \i  1.1.3
+            \i  No
+            \i  No
+        \row
+            \i  Qt 4.7.3 for Symbian^3
+            \i  Yes
+            \i  1.1.3
+            \i  Yes
+            \i  Yes
+    \endtable
+
     \section1 Publishing Qt Content for Maemo Devices
 
     The applications that you publish on Ovi Store, must meet the testing criteria