diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 07:00:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 07:00:40 (GMT) |
| commit | ba9218a9786abddd461034b5aeb1d5a39f8072f9 (patch) | |
| tree | c494a78c355803285e4efa4e9d489babb9cd8fea /src/activeqt/shared | |
| parent | 379b4dc81177b95c15de30c5925efca1136e4041 (diff) | |
| parent | 633a5cf6d8197105d6392dbf56bf0f29f9c84da1 (diff) | |
| download | Qt-ba9218a9786abddd461034b5aeb1d5a39f8072f9.zip Qt-ba9218a9786abddd461034b5aeb1d5a39f8072f9.tar.gz Qt-ba9218a9786abddd461034b5aeb1d5a39f8072f9.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: (22 commits)
Regression fix for Loader anchors not working
Make Qt.include() work for js files that have '.pragma library'
doc fix
Improve docs for Qt.quit()
Prevent assignment of values (string, number, bool) to signal handlers.
Make sure strings are escaped when returned via asScript.
Documentation
git ignore stuff
Test Qt.labs.folderlistmodel plugin
Fix naming.
Sometimes you own QNetworkReply, sometimes you don't.
Rename files; fix test.
Add parent parameter to QDeclarativeExpression constructor.
Round correctly in binding optimizer
Don't disable SmoothPixmapTransform in qDrawBorderPixmap()
Photoviewer example fixes.
Port from QListModelInterface to QAbstractListModel.
Use QDeclarativeScriptString for ParentChange.
Set raster + gl viewport as the default for OS X.
Move stuff from QML viewer to plugins.
...
Diffstat (limited to 'src/activeqt/shared')
0 files changed, 0 insertions, 0 deletions