summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-15 07:52:49 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-15 07:52:49 (GMT)
commitb3e90bb727cbdb9dbfaad8bc92c155180bbcf7ec (patch)
tree42c2df9a2cd2d14a1366d8841cad70b7daeb1a6a
parentca7a96943c122b8371caf98dc92f7e6644de1814 (diff)
parent4ab3154c2e9d777d8e84101852866809dce44074 (diff)
downloadQt-b3e90bb727cbdb9dbfaad8bc92c155180bbcf7ec.zip
Qt-b3e90bb727cbdb9dbfaad8bc92c155180bbcf7ec.tar.gz
Qt-b3e90bb727cbdb9dbfaad8bc92c155180bbcf7ec.tar.bz2
Merge branch 'small' into 4.7
-rw-r--r--doc/src/deployment/deployment.qdoc1
-rw-r--r--doc/src/development/qmake-manual.qdoc27
-rw-r--r--doc/src/platforms/supported-platforms.qdoc2
-rwxr-xr-xdoc/src/template/style/style.css9
4 files changed, 30 insertions, 9 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 664f002..c078316 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -756,6 +756,7 @@
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 21
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
assemblies at the
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 018362e..d65967d 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -939,7 +939,9 @@
\snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 130
- The default values depend on the version of the Symbian SDK you're using.
+ The default values depend on the version of the Symbian SDK you're using,
+ however, the Qt toolchain sets this to the maximum possible value and this
+ should not be changed.
\section2 Compiler specific options
@@ -958,23 +960,30 @@
Symbian applications may have unique identifiers attached to them.
Here is how to define them in a project file:
- There are four types of IDs supported: \c UID2, \c UID3, \c SID, and \c VID. They
+ There are four available types of IDs supported: \c UID2, \c UID3, \c SID, and \c VID. They
are specified like this:
\snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 132
- If \c UID2 is not specified, it defaults to the same value as \c UID3.
+ If \c SID is not specified, it defaults to the same value as \c UID3.
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 obtain
- an official UID, please contact Nokia. Both \c SID and \c VID default to empty values.
-
- For more information about unique identifiers and their meaning for
- Symbian applications, please refer to the Symbian SDK documentation.
-
+ an official UID, please contact \l{Symbian}{http:\\www.symbiansigned.com}.
+ Both \c SID and \c VID default to empty values.
+
+ There exists one UID1 too, but this should not be touched by any application.
+
+ The UID2 has a specific value for different types of files - e.g. apps/exes
+ are always 0x100039CE. The toolchain will set this for value for the most common file types like,
+ EXE/APP and shared library DLL.
+
+ For more information about unique identifiers and their meaning for Symbian applications,
+ please refer to the \l{Symbian SDK documentation}{http://developer.symbian.org/main/documentation/reference/s3/pdk/GUID-380A8C4F-3EB6-5E1C-BCFB-ED5B866136D9.html}
+
\section2 Capabilities
- Capabilities define extra priviledges for the application, such as the
+ Capabilities define extra privileges for the application, such as the
ability to list all files on the file system. Capabilities are defined
in the project file like this:
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 31866c4..5218690 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -123,6 +123,8 @@
\o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
\endtable
+ \note The PPC architecture on Mac has been downgraded from tier 1 to tier 2 for 4.7.
+
\section1 Tier 3 Platforms (Not supported by Nokia)
All platforms not specifically listed above are not supported by Nokia. Nokia does
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 12d297d..536b3c8 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -926,6 +926,15 @@
color: #4c0033;
text-decoration: underline;
}
+ descr p a
+ {
+ text-decoration: underline;
+ }
+
+ .descr p a:visited
+ {
+ text-decoration: underline;
+ }
.feedback
{
float: none;