diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 09:49:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 09:49:13 (GMT) |
| commit | dbfedcb31961579499fcb5342ccc42311191bcd4 (patch) | |
| tree | 3e8c020ec99a5d69b9787a8d164a2f326936eebc /src/declarative/graphicsitems/qdeclarativeevents_p_p.h | |
| parent | aa9211937ff38c0fffa55bc879130b33f03865ff (diff) | |
| parent | 30ffe43f826baae366b6e745d077ade316512d3b (diff) | |
| download | Qt-dbfedcb31961579499fcb5342ccc42311191bcd4.zip Qt-dbfedcb31961579499fcb5342ccc42311191bcd4.tar.gz Qt-dbfedcb31961579499fcb5342ccc42311191bcd4.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: (681 commits)
Be consistent in conversion from string (eg. color, int rounding).
Simplify code to make next change clearer.
Stop warnings.
Improve error messages when tests fail.
Stop highlight animators for highlightFollowsCurrentItem: false
Ensure valuetype enums can be assigned from JS
Improve testcase
Rename Component::errorsString() -> errorString() (and also for
Fixes for docs, example code
Make test more stable
Autotest (XFAIL) for QTBUG-10822
Add return value for resolveTypeInNamespace
Fix test
Fix test. Missed files.
Missing break
Create overview page for examples for Extending QML in C++
Added default countries for Mongolian and Nepali.
Updated tst_qlocale autotest.
Updated the 4.7.0 change log with my changes.
Freetype is not used on symbian, don't use it.
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeevents_p_p.h')
0 files changed, 0 insertions, 0 deletions