Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix test failure. | Warwick Allison | 2009-12-02 | 1 | -2/+2 |
| | | | | That +1 was a typo (the qCeil is already sufficient to bound to int rect). | ||||
* | Don't set size, that now crops tile in pixelCache. | Warwick Allison | 2009-12-02 | 1 | -2/+0 |
| | |||||
* | Expect warning. | Warwick Allison | 2009-12-02 | 1 | -0/+3 |
| | |||||
* | Update error message. | Warwick Allison | 2009-12-02 | 1 | -2/+2 |
| | | | | Still correct: just reporting other "end" of the loop. | ||||
* | Update for change d406a899943c6d56d921bc290a009415a3c4eba5 | Warwick Allison | 2009-12-02 | 1 | -3/+3 |
| | |||||
* | Undo most of 913dd563064e8047fe738fc9c79135adfb928977 | Warwick Allison | 2009-12-02 | 197 | -523/+523 |
| | | | | It seems we're going to have to so a syncqt/configure in Qt modules. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 137 | -691/+696 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fix indenting | Aaron Kennedy | 2009-12-02 | 1 | -6/+6 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-02 | 137 | -686/+661 |
| |\ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/declarative/qml/qmlvme.cpp | ||||
| | * | Fix initial scaling. QWebPage::setPreferredSize doesn't really work. | Warwick Allison | 2009-12-02 | 2 | -9/+3 |
| | | | |||||
| | * | Restructure for easier re-use. | Warwick Allison | 2009-12-02 | 7 | -278/+276 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-02 | 33 | -286/+641 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlmetatype.cpp | ||||
| | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-02 | 30 | -198/+635 |
| | | |\ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | Remove qlistmodelinterface.h duplicate | Martin Jones | 2009-12-02 | 3 | -87/+2 |
| | | | | | |||||
| | * | | | Change from scaling/zooming by zoomFactor to instead use painter scaling. | Warwick Allison | 2009-12-02 | 6 | -42/+107 |
| | | | | | | | | | | | | | | | | | | | | Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision. | ||||
| | * | | | Compile as module. | Warwick Allison | 2009-12-02 | 2 | -0/+3 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 4 | -7/+139 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 7 | -5/+318 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Compile when in module. | Warwick Allison | 2009-12-01 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 1 | -60/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | | Remove include styles that rely on configure. | Warwick Allison | 2009-12-01 | 122 | -298/+297 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | May help modularization (syncqt and configure are Qt-specific). | ||||
| * | | | | | | | Minor performance tweaks | Aaron Kennedy | 2009-12-02 | 2 | -6/+36 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Update header & footer pos when items inserted. | Martin Jones | 2009-12-02 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 25 | -192/+573 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | Delay the creation of the signal parameter object until needed | Aaron Kennedy | 2009-12-02 | 2 | -12/+14 |
| | | | | | | | |||||
| * | | | | | | Run QmlParserStatus::componentComplete() in opposite order | Aaron Kennedy | 2009-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves perf when a parent depends on its childrens' size. | ||||
| * | | | | | | Cleanup cached binding closures | Aaron Kennedy | 2009-12-02 | 4 | -14/+19 |
| | | | | | | | |||||
| * | | | | | | Cache binding closures | Aaron Kennedy | 2009-12-02 | 11 | -16/+118 |
| | | | | | | | |||||
| * | | | | | | Compile | Aaron Kennedy | 2009-12-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-02 | 11 | -29/+208 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | | | | QML timing utility | Aaron Kennedy | 2009-12-02 | 3 | -0/+155 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-01 | 7 | -5/+330 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-01 | 1 | -60/+0 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-01 | 3 | -8/+19 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-11-30 | 2 | -3/+48 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into ↵ | Aaron Kennedy | 2009-11-30 | 67 | -740/+1040 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2009-11-30 | 67 | -740/+1040 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| * | | | | | | | | | | | Two way WorkerScript communications | Aaron Kennedy | 2009-11-30 | 9 | -159/+276 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | When loading QML, reset the Browser view. | Martin Jones | 2009-12-02 | 1 | -4/+17 |
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | | | | Get qsTr and friends working again. | Michael Brasser | 2009-12-01 | 1 | -1/+4 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Allow Flickable direction to be set explicitly. | Martin Jones | 2009-12-02 | 5 | -6/+62 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12-01 | 79 | -817/+1513 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | | | | | | doc fix | Bea Lam | 2009-11-30 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Fix jumpy EaseFollow animations | Martin Jones | 2009-12-01 | 1 | -1/+1 |
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5766 | ||||
* | | | | | | | | Add header and footer to ListView. | Martin Jones | 2009-12-01 | 2 | -5/+137 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Build correct QmlViewer Screen orientation implementation for Maemo. | Martin Jones | 2009-12-01 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Cleanup orientation stuff. | Martin Jones | 2009-12-01 | 1 | -14/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-01 | 71 | -804/+1044 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |