summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-2216-1098/+58
|\ | | | | | | into kinetic-declarativeui
| * Move the viewport by whole pixels to avoid painting artifacts.Martin Jones2009-12-222-3/+18
| |
| * Try to avoid creating multiple delegates per frame with cachebuffer.Martin Jones2009-12-221-8/+39
| |
| * Remove loader. Its functionality is now available in qmlviewer.Martin Jones2009-12-2212-1086/+0
| |
| * export QmlStyledTextMartin Jones2009-12-221-1/+1
| |
* | Remove unused optimizationAaron Kennedy2009-12-228-158/+2
| |
* | Minor optimizationsAaron Kennedy2009-12-224-16/+7
|/
* Don't crash when a subscription is not requiredAaron Kennedy2009-12-221-2/+3
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-227-25/+465
|\ | | | | | | into kinetic-declarativeui
| * Implement a fast "styled" text format.Martin Jones2009-12-227-25/+465
| |
* | benchmarkAaron Kennedy2009-12-221-2/+27
|/
* Export QmlAbstractBinding classKai Koehne2009-12-211-1/+1
| | | | The class is referenced in QmlMetaProperty.
* Added isAlias to the QmlDomDynamicProperty.Erik Verbruggen2009-12-212-1/+19
|
* Improve binding optimizer's subscription logicAaron Kennedy2009-12-211-3/+8
|
* Empty URLs should not be resolvedAaron Kennedy2009-12-212-5/+8
|
* Optimization: signal connectionsAaron Kennedy2009-12-212-5/+35
|
* More binding optimizationsAaron Kennedy2009-12-211-14/+143
|
* Simply type managementAaron Kennedy2009-12-211-47/+35
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-211-2/+1
|\ | | | | | | into kinetic-declarativeui
| * Remove a couple of connects is ListView.Martin Jones2009-12-211-2/+1
| |
* | Optimization: don't use QTextControl in Text elementAaron Kennedy2009-12-212-25/+15
| |
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-214-77/+113
|\ \ | |/ | | | | into kinetic-declarativeui
| * Remove unnecessary locking.Martin Jones2009-12-211-14/+10
| |
| * Fix Flickable within Flickable, with parent flickable !interactive.Martin Jones2009-12-202-9/+14
| |
| * Avoid excessive calls to QTime::currentTime()Martin Jones2009-12-181-2/+1
| |
| * Make sure header/footer are correctly positioned.Martin Jones2009-12-181-3/+11
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-181-1/+79
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | ListView housekeeping optimizations.Martin Jones2009-12-181-52/+80
| | |
* | | BenchmarkAaron Kennedy2009-12-181-0/+34
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-181-19/+5
|\ \ | |/ | | | | into kinetic-declarativeui
| * Remove unnecessary attached prop. hash.Martin Jones2009-12-181-19/+5
| |
* | Optimize Math.max and Math.minAaron Kennedy2009-12-181-1/+79
|/
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-1824-162/+266
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Remove QML_ENABLE_DEFERRED env variableAaron Kennedy2009-12-181-2/+1
| | | | | | | | Use QML_EXPERIMENTAL instead
| * Support binding optimizer and deferred propertiesAaron Kennedy2009-12-183-10/+10
| |
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-187-58/+74
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Have qmlInfo report the QML element name rather than C++ class name.Michael Brasser2009-12-187-58/+74
| | | | | | | | | | | | Task-number: QTBUG-5476
| * | Use deferred properties in states and transitionsAaron Kennedy2009-12-184-0/+6
| | |
| * | Deferred properties are off by defaultAaron Kennedy2009-12-181-0/+4
| |/
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-18282-4827/+6854
| |\ | | | | | | | | | into kinetic-declarativeui
| * | Fix deferred property bugsAaron Kennedy2009-12-1811-94/+173
| | | | | | | | | | | | | | | Previously deferred properties would fail if any of the sub objects used bindings or QmlParserStatus. Whoops.
* | | Section property access perf.Martin Jones2009-12-183-19/+41
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-12-1816-1642/+2
|\ \ | | | | | | | | | into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-12-1837-222/+659
| |\ \ | | | | | | | | | | | | into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-174-1/+25
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Section properties can only be model data.Martin Jones2009-12-171-7/+2
| | | | |
| * | | | Remove creatorplugin (it's moved to the creator repository)Bea Lam2009-12-1715-1635/+0
| | | | |
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-17251-3122/+6690
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-172-12/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added discussion on connecting signals that have default arg values. Stack overflow when closing a Color panel in Cocoa.
| | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-1731-346/+253
| | |\ \ \ \