diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 19:04:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 19:04:14 (GMT) |
| commit | 0727c544915427372951b1c30715a09e473ec494 (patch) | |
| tree | f91fa94a5a3f693470e37235f60df66afb454968 /util/lexgen | |
| parent | 7df48c278ed8a8e589ef674f95f8b1098d067789 (diff) | |
| parent | be7edc40324bb135548888853df28bf94eb2aa79 (diff) | |
| download | Qt-0727c544915427372951b1c30715a09e473ec494.zip Qt-0727c544915427372951b1c30715a09e473ec494.tar.gz Qt-0727c544915427372951b1c30715a09e473ec494.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)
Update QtDeclarative def files
Fix crash in MouseArea
Compile
Fixes undeleted timers (and endless warning from the event loop about
Remove unneeded member variable.
Fix test.
Generalize qml "registration"
Fix compiler warning
Fix TextInput echoMode autotest on Linux
Reuse QML lexer to simplify .pragma script logic
Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents
Remove QDeclarativeItem::childrenChanged() signal overload
Update QtGui and QtDeclarative def files
Make rootContext and engine pointers in QDeclarativeView API const
Add additional QVariant benchmarks.
Allow MouseArea dragging to filter mouse events from descendants
Expand QDeclarativeExtensionPlugin docs
Add missing snippet files
Expand QtObject doc
Indicate default values
...
Diffstat (limited to 'util/lexgen')
0 files changed, 0 insertions, 0 deletions