Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | 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 | ||||
| * \ \ \ \ \ | 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 |
| | | | | | |||||
* | | | | | 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 ↵ | Martin Jones | 2009-12-01 | 71 | -804/+1044 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Make focusOnPress the default behaviour for TextEdit (like TextInput). | Michael Brasser | 2009-12-01 | 2 | -2/+2 |
| | | |_|/ | | |/| | | |||||
| * | | | | Add Screen element in QmlViewr Module including orientation property. | Martin Jones | 2009-12-01 | 5 | -3/+328 |
| | | | | | | | | | | | | | | | | | | | | Add support for automatic Maemo rotation update. | ||||
* | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-01 | 1 | -60/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | Remove accidentally added file. | Michael Brasser | 2009-12-01 | 1 | -60/+0 |
| | |_|/ | |/| | | |||||
* | | | | 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 '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-30 | 67 | -740/+1040 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| | * | | | Fixed build on S60 and WinCE | Thorbjørn Lindeijer | 2009-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Since qreal is a float on these targets, it was having trouble picking the right version of qMax. | ||||
| * | | | | unwarn | Warwick Allison | 2009-11-30 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Fix PropertyAction crash. | Martin Jones | 2009-11-30 | 1 | -5/+16 |
| | |/ | |/| | | | | | | | | | | It is possible for the animation to stop while in doAction(), which would then delete the animations we were running. | ||||
* | | | 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 ↵ | Martin Jones | 2009-11-30 | 6 | -0/+23 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Add orientation property to qmlviewer. | Martin Jones | 2009-11-30 | 2 | -3/+48 |
| | | | | |||||
* | | | | 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 | ||||
| | * | | Merge remote branch 'staging/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-27 | 14 | -67/+164 |
| | |\ \ | |||||
| | | * | | fix crash on closing all files under certain circumstances | Oswald Buddenhagen | 2009-11-26 | 3 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after all, it is no good idea to announce the removal of all columns just to let the view headers adjust themselves - it also makes the views emit currentItemChanged() which has some undesirable side effects. so don't do it an fix the header manually. | ||||
| | | * | | ignore Alt+Space acelerators - useless and too many false positives | Oswald Buddenhagen | 2009-11-26 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4429 |