diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 10:01:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 10:01:36 (GMT) |
| commit | 9bff3a231b0fc6d45deb65f4d69139e86ef35b62 (patch) | |
| tree | 04c8f14042c11e2a4389fcbed8c7d1a0d5befd22 /doc/src/snippets/code | |
| parent | fd330a5a6009c17e28fb9eb36b5bffbc19c5df68 (diff) | |
| parent | 31b972b12db4497f1c3ba1762d784c7315e75b62 (diff) | |
| download | Qt-9bff3a231b0fc6d45deb65f4d69139e86ef35b62.zip Qt-9bff3a231b0fc6d45deb65f4d69139e86ef35b62.tar.gz Qt-9bff3a231b0fc6d45deb65f4d69139e86ef35b62.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: (77 commits)
Recompute the source location of regexp literals.
Adds a way to clear the state list property in QDeclarativeStateGroup
I've been told this fixes compilation on windows.
Doc Augmentation
Added highlight ranges/modes to PathView
Use QThread IdlePriority rather than linux platform code.
Test and fix order of transform application.
Test transforms.
Fix namespace.
Simple case, no size returned.
sourceWidth/sourceHeight -> sourceSize
QDeclarativeItem don't need to emit childrenChanged anymore.
Control of image rendered size (esp. SVG).
Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates.
Update test.
Add autotest for QTBUG-9367.
Remove Q prefix from the validators.
Really fix qMin() parameter types.
Add declarative subdir to examples.pro
Add Symbian deploy section for qml import plugins
...
Diffstat (limited to 'doc/src/snippets/code')
| -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 |
2 files changed, 8 insertions, 3 deletions
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] |