Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Tests | Aaron Kennedy | 2009-11-16 | 3 | -36/+46 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-16 | 1 | -2/+5 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-11-16 | 12 | -396/+267 |
| |\ | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | Autotests. | Michael Brasser | 2009-11-16 | 1 | -2/+5 |
| | | | |||||
* | | | Remove dead code | Aaron Kennedy | 2009-11-16 | 3 | -23/+0 |
| |/ |/| | |||||
* | | QmlEngine tests | Aaron Kennedy | 2009-11-16 | 1 | -11/+5 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-16 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/declarative.pro | ||||
| * | | Avoid clipping last pixel of text in QML in some cases | Eskil Abrahamsen Blomfeldt | 2009-11-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We would floor the width of the text layout and clip the output to this, hence cutting away the last pixel of the text in cases where the text width was not pixel aligned. Task-number: QTBUG-5431 Reviewed-by: Gunnar | ||||
| * | | Build on non-g++ compilers. | Andreas Aardal Hanssen | 2009-11-13 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | Uncommenting these lines might have been a mistake during the merge (sha1 14821863b830b85ccb29df217a52f1ca52c9c421). Reviewed-by: kkoehne | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-13 | 1 | -18/+18 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-13 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | unwarn | Warwick Allison | 2009-11-13 | 1 | -18/+18 |
| | | | | |||||
* | | | | Don't enable gcov flags | Aaron Kennedy | 2009-11-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-13 | 6 | -227/+155 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-13 | 129 | -787/+720 |
| |\ \ \ | | |/ / | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-13 | 8 | -220/+212 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | WebView tests and testability. | Warwick Allison | 2009-11-13 | 3 | -93/+154 |
| | | | | | |||||
| | * | | | Remove unused methods of QmlListAccessor. | Martin Jones | 2009-11-13 | 2 | -133/+0 |
| | | |/ | | |/| | |||||
| * | | | Fix bug in WATCH_OBJECT_R message and add more tests. | Bea Lam | 2009-11-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | XMLHttpRequest tests | Aaron Kennedy | 2009-11-13 | 1 | -15/+32 |
| |_|/ |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-13 | 18 | -133/+106 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/globalobject.qdoc | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-13 | 7 | -93/+28 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-11-13 | 103 | -201/+235 |
| | |\ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | Cleanup. | Michael Brasser | 2009-11-13 | 6 | -76/+19 |
| | | | | | |||||
| | * | | | Enforce unique role names for XmlListModel. | Michael Brasser | 2009-11-13 | 1 | -17/+9 |
| | | | | | |||||
| * | | | | Make 'public' (testable) | Warwick Allison | 2009-11-13 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-13 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | All items in list should have z: 1 | Martin Jones | 2009-11-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-11-13 | 97 | -145/+147 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | | Compile. | Martin Jones | 2009-11-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | doc | Warwick Allison | 2009-11-13 | 7 | -35/+73 |
| | |/ / / | |/| | | | |||||
* | | | | | Better gcov compile flags | Aaron Kennedy | 2009-11-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | XMLHttpRequest tests | Aaron Kennedy | 2009-11-13 | 1 | -117/+36 |
| | | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-13 | 98 | -147/+149 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-13 | 7 | -29/+140 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Export symbols for private QmlValueType, QmlValueTypeFactory classes | Kai Koehne | 2009-11-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Used in Bauhaus. | ||||
| * | | | | Use local includes, not those in Qt. It matters when Declarative is a module | Warwick Allison | 2009-11-13 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | installed after Qt. | ||||
| * | | | | Do not use "QtDeclarative/XXX" style includes in declarative module code, | Warwick Allison | 2009-11-12 | 96 | -145/+145 |
| | | | | | | | | | | | | | | | | | | | | as it breaks reinstalling the module against existing Qt. | ||||
* | | | | | XMLHttpRequest tests | Aaron Kennedy | 2009-11-13 | 1 | -7/+4 |
| | | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-12 | 6 | -27/+138 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-12 | 5 | -10/+127 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Update ParentChange + docs. | Michael Brasser | 2009-11-12 | 3 | -7/+95 |
| | | | | | |||||
| | * | | | Autotests. | Michael Brasser | 2009-11-12 | 2 | -3/+32 |
| | |/ / | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-12 | 4 | -6/+26 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Visual tests for positioners | Alan Alpert | 2009-11-12 | 1 | -17/+11 |
| | | | | | | | | | | | | | | | | | | | | dynamic.qml covers some of the more complex memory management issues, one of which is also fixed in this commit. | ||||
* | | | | Qt.md5() method | Aaron Kennedy | 2009-11-12 | 2 | -0/+15 |
| |/ / |/| | | |||||
* | | | Output error when a binding returns undefined | Aaron Kennedy | 2009-11-11 | 1 | -1/+12 |
| | | | |||||
* | | | Fixup qmllanguage::aliasProperties test | Aaron Kennedy | 2009-11-11 | 3 | -5/+14 |
|/ / | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-11 | 25 | -122/+90 |
|\ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/util.pri | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-11 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |