diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 00:45:31 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 00:45:31 (GMT) |
commit | 06feadb8eb0beb3422cf32abab7971f963de7ecf (patch) | |
tree | 50366df044be7968e25bde5cd35fe6a1b59cc809 /dist/changes-3.1.1 | |
parent | 16e8cc808ae7087aadd95855c97d715941711b45 (diff) | |
parent | c62cd5347adda26a68b3a2a67e04a38c0e8626fe (diff) | |
download | Qt-06feadb8eb0beb3422cf32abab7971f963de7ecf.zip Qt-06feadb8eb0beb3422cf32abab7971f963de7ecf.tar.gz Qt-06feadb8eb0beb3422cf32abab7971f963de7ecf.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: (42 commits)
Remove more accidentally submitted code
Comment out unused method.
Document - and use - the qmlRegisterXXX template functions
when loading debug import plugins on Mac, try with _debug.dylib suffix
fix inclusion of qt_targets.pri in qimportbase.pri
Use TARGETPATH instead of hardcoding locations
Fix location in which webkit import is stored in builddir
Oooops --- revert wrong commit
Doc
Remove accidentally submitted code
Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change.
Unify binding optimizer and QtScript binding signal management logic
Schedule view relayout after itemsInserted/Removed()
Use no-version-specified to mean any version (used to work, fixed again,
URL redirection for font loader
URL redirection for AnimatedImage
Technically, Location can be relative (never is though...)
URL redirection for normal images.
URL redirection for components resources.
URL redirects for border image.
...
Diffstat (limited to 'dist/changes-3.1.1')
0 files changed, 0 insertions, 0 deletions