diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 07:28:23 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 07:28:23 (GMT) |
commit | 4f933036a0ecbc6e6174b312ec2fd6078cea5b70 (patch) | |
tree | 2359dbf112a07a005f913aa46765bbf52b8bff95 /doc/src | |
parent | 1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (diff) | |
parent | dffa9fdeae46974aab53a502af257a83ec319b1b (diff) | |
download | Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.zip Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.tar.gz Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Symbian system date format parsing.
Fix QXmlSimpleReader auto test failer
Fix pointer event mapping when windows are fixed to native orientation
Fix incorrect Symbian version check.
Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.
Improved support for shadow builds in Symbian.
Fix def file paths for Symbian shadow builds
Giving QUuid::createUuid() more entropy on Symbian
Enable running of XQuery test suite
QXmlSimpleReader handle external entity reference file over 1k
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/development/qmake-manual.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 329bac5..2c7fda2 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1184,6 +1184,10 @@ Any rules you define will be added after automatically generated rules in each section. + \note Content specified using \c BLD_INF_RULES is inserted as-is into the \c bld.inf + file, so any rules that specify host side paths may not work correctly when doing + a shadow build. + \target CONFIG \section1 CONFIG @@ -1521,6 +1525,10 @@ override languages statement, you must override also package-header statement and all other statements which are language specific. + \note Custom deployments specified using \c pkg_postrules are inserted + as-is into the \c PKG file, so any rules that specify host side paths may not + work correctly when doing a shadow build. + On the Symbian platform, three separate PKG files are generated: \list @@ -1911,6 +1919,10 @@ \c TARGET.EPOCSTACKSIZE. Doing so could result in duplicate statements in the MMP file. + \note Content specified using \c MMP_RULES is inserted as-is into the \c MMP + file, so any rules that specify host side paths may not work correctly when doing + a shadow build. + \target MOC_DIR \section1 MOC_DIR |