diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 10:13:32 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 10:13:32 (GMT) |
commit | 03686225036ebfc5cf78e3fcc66f5810a140c7d2 (patch) | |
tree | e35bcaf151edb27b5e48fc989c6727039c397f5b /doc/src | |
parent | 194013d9db1b3e4ba6f56a864f3b64f523202948 (diff) | |
parent | 72599ca45c416f2f0a9654412c14a148ca3d728c (diff) | |
download | Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.zip Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.tar.gz Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
Optimize QML "parent" property access
Begin dragging PathView up to the level (quality and functionality) of other views.
Rename qdeclarativetime -> qmltime
Auto-test fix.
Build Fix and port to new width and height properties
Port Flickable and Flipable to support QGraphicsObject.
Protect the QDeclarativeListProperty used in QGraphicsItem with ifdef
Fix the build due to new properties in QGraphicsObject.
Remove the children property from QDeclarativeItem.
Rename qdeclarativetime -> qmltime
Update AnchorChanges to use more natural form for setting anchors.
Pen is not a creatable type.
Begin dragging PathView up to the level (quality and functionality) of other views.
Fix error reporting when symbian file copy fails.
Stabilize QGraphicsEffect test on X11
QIODevice::read() and QFile::atEnd() performance improvements
Clarified pkg_prerules usage documentation.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
Made it possible to define more than one language using pkg_prerules
Symbian QAudioOutput::suspend() was resetting processedUSecs() to zero
...
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/development/qmake-manual.qdoc | 18 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 7 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 4 |
3 files changed, 21 insertions, 8 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 8cb8705..688122b 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1425,12 +1425,20 @@ is the application private directory on the drive it is installed to. attention that also other statements stay valid. For example if you 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: \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141 diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index 3b0cda1..48e9ac6 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -463,7 +463,8 @@ vendorinfo = \ "%{\"Example Localized Vendor\"}" \ ":\"Example Vendor\"" -default_deployment.pkg_prerules = vendorinfo +my_deployment.pkg_prerules = vendorinfo +DEPLOYMENT += my_deployment //! [56] //! [57] @@ -471,7 +472,9 @@ supported_platforms = \ "; This demo only supports S60 5.0" \ "[0x1028315F],0,0,0,{\"S60ProductID\"}" -default_deployment.pkg_prerules += supported_platforms +default_deployment.pkg_prerules -= pkg_platform_dependencies +my_deployment.pkg_prerules += supported_platforms +DEPLOYMENT += my_deployment //! [57] //! [58] diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index 36676ae..d9e5d3c 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -933,7 +933,9 @@ DEPLOYMENT += somelib justdep //! [140] //! [141] -default_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}" +default_deployment.pkg_prerules -= pkg_platform_dependencies +my_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}" +DEPLOYMENT += my_deployment //! [141] //! [142] |