diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 08:45:45 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 08:45:45 (GMT) |
commit | 3ab0ecc3459ae80e038e311a053ce780dcdcd7cf (patch) | |
tree | 2219ed2e0b7fcd1013f438deda14d9ce571fea57 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
parent | ffcbe13f0adc7ada8f04b74ed60660b033ee242f (diff) | |
parent | 2814766c9e26159a1d45c50f1204f72d4f7bae91 (diff) | |
download | Qt-3ab0ecc3459ae80e038e311a053ce780dcdcd7cf.zip Qt-3ab0ecc3459ae80e038e311a053ce780dcdcd7cf.tar.gz Qt-3ab0ecc3459ae80e038e311a053ce780dcdcd7cf.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: (100 commits)
Fixed compile with xlC.
Added autotest for Component.createObject() without Qt.createComponent()
Compiler warning
Remove incorrect ASSERT
Be slightly more verbose on assigning undefined in binding.
Doc fixes
Don't crash when assigning a Behavior to a grouped property.
Get rid of 'noise' when using GL and the top-level item is an Item.
Fix visual tests after rename of the qml executable.
Do not attempt to setParent of object in a different thread
Don't polish QDeclarativeItems.
Check QML files for license headers too.
Make compile: include script module for test
Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate
Allow resource files to be loaded in WorkerScript
Fix TextEdit alignment.
Component::createObject() don't attempt to set parent of null object
Factor out initialization effects from declarative benchmarks.
Remove license headers from test data.
Fix warnings
...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions