summaryrefslogtreecommitdiffstats
path: root/demos/embedded
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-17 11:32:45 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-17 11:32:45 +0200
commit94a3356d5eb7b255d439efe2699bf3a9b025e8eb (patch)
tree49bdb24dde6e2cc6bc4d5c63281498c6b757ddeb /demos/embedded
parentbdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c (diff)
parent1db36a5a37dcca0e24ada3c852f2647ab2330eee (diff)
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: Move xmldata example into rssnews demo. Move Q_ENUMS to start of class declaration Restructure QDeclarativeAbstractBinding destructor Don't call pure virtual method in ~QDeclarativeAbstractBinding() Fix examples autotest when compiled without webkit or xmlpatterns Check for acquireReg() failure Focus should be applied to focus scopes all the way up the chain, not Add focus docs snippets Fix doc for status, add Image::onLoaded. Don't crash due to recursive positioning. ListModel::get() shouldn't print warnings for invalid indices since it Add \brief to TextInput Add missing .pro Restructure the examples. They are now organized into various graphicsWidgets doc example was previously removed Doc fix Add a "priority" property to Keys and KeyNavigation
Diffstat (limited to 'demos/embedded')
0 files changed, 0 insertions, 0 deletions