diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 13:41:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 13:41:53 (GMT) |
| commit | c79a78b7f48ba806c578e7213d4cdcda00f9ea17 (patch) | |
| tree | 0e4a40862568993e70828a638ba97677c1197532 /doc/src/snippets/code/src_script_qscriptengineagent.cpp | |
| parent | 2fab427e4c30a81ea73b8fa1a3f6fee9706caad0 (diff) | |
| parent | 38d7fb497eec5491e2d845e7eb5522dafc6ab42b (diff) | |
| download | Qt-c79a78b7f48ba806c578e7213d4cdcda00f9ea17.zip Qt-c79a78b7f48ba806c578e7213d4cdcda00f9ea17.tar.gz Qt-c79a78b7f48ba806c578e7213d4cdcda00f9ea17.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (83 commits)
Add export to QDeclarativeBasePositioner
Fix assert when placing a .qml file inside $QTDIR/imports
Moved the partial deployment section to qbase.pri.
Made the Symbian menu close when switching native focus.
Document PropertyAnimation::targets property
Fix test.
QHostInfo: Fix a crash when a new request is pushed while resolving.
Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2
Fix a compilation issue of tst_qsettings for win32-msvc.
fix RSS listing example
QML Debugging: Documentation fixes
dist/changes: QML Debugging changes
Updated changes-4.7.1.
Do not set DESTDIR to the current directory
Small fixes to Browser.qml
Fix dependency on the plugins rule for multimedia
More declarative autotests.
Fix example.
Assistant: Don't register internal doc when using custom collection.
Assistant: Move comment to the right place.
...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengineagent.cpp')
0 files changed, 0 insertions, 0 deletions