Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix compile after merge from 4.6. | Michael Brasser | 2009-08-25 | 20 | -20/+20 |
| | |||||
* | Don't crash for QFxWebView::setUrl(QUrl) | Kai Koehne | 2009-08-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-25 | 4 | -34/+243 |
|\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlcompiler.cpp src/declarative/qml/qmlengine_p.h | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-25 | 3 | -37/+237 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Implement QFxKeyNavigationAttached class | Aaron Kennedy | 2009-08-25 | 3 | -39/+142 |
| | | | | | | | | | | | | Documentation is missing until we fix up focus behaviour | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-08-25 | 3 | -9/+18 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Add (non-functional) KeyNavigation type | Aaron Kennedy | 2009-08-25 | 1 | -1/+98 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-25 | 2 | -7/+13 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Remove unnecessary KeysAttached static map | Martin Jones | 2009-08-25 | 2 | -7/+13 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-24 | 4 | -36/+52 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Fix list startPosition calculation. | Martin Jones | 2009-08-24 | 1 | -2/+5 |
| | |/ | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-24 | 7 | -83/+120 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Add missing CONSTANT to view property. | Yann Bodson | 2009-08-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-24 | 4 | -35/+48 |
|\ \ \ \ | | |_|/ | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Add a spacing property to ListView | Martin Jones | 2009-08-24 | 2 | -14/+41 |
| | | | | |||||
| * | | | Fix onFooPressed key handlers. | Martin Jones | 2009-08-24 | 2 | -21/+7 |
| | |/ | |/| | |||||
* | | | Centralize QNetworkRequest attribute setting, turn on pipelining. | Warwick Allison | 2009-08-24 | 2 | -2/+0 |
|/ / | | | | | | | | | | | | | | | ... in two places. Qt expects the "application" to configure caching, proxy, pipelining, etc., on a QNetworkAccessManager, so now we do that in the two most important cases: the loader example and qmlviewer tool. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-24 | 1 | -2/+0 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-08-24 | 2 | -6/+23 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Remove duplicated signals. | Michael Brasser | 2009-08-24 | 1 | -2/+0 |
| | |/ | |/| | |||||
* | | | Rename positioners. | Warwick Allison | 2009-08-24 | 4 | -75/+75 |
| | | | | | | | | | | | | QFxBasePositioner still exists though. | ||||
* | | | Special handling of Tab/BackTab | Warwick Allison | 2009-08-24 | 2 | -0/+22 |
| |/ |/| | | | | | | | This may need to be reconsidered with QML focus improvements, but for now, we simply ensure the webview behaves like a QWebView. | ||||
* | | Fix WebViewSettings | Warwick Allison | 2009-08-24 | 2 | -6/+23 |
|/ | | | | | More QML <-> JavaScript integration, with example. From Tapani Mikola | ||||
* | Doc fix (Rect->Rectangle) | Kai Koehne | 2009-08-21 | 1 | -2/+2 |
| | |||||
* | Add MouseRegion::pressedButtons property. Update mouseX/Y when hovered. | Martin Jones | 2009-08-21 | 2 | -8/+65 |
| | |||||
* | Add font doc to TextInput and TextEdit. | Yann Bodson | 2009-08-20 | 3 | -3/+13 |
| | |||||
* | Update documentation regarding font.pointSize | Yann Bodson | 2009-08-20 | 3 | -18/+18 |
| | |||||
* | Basic types documentation | Yann Bodson | 2009-08-20 | 1 | -1/+1 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-20 | 8 | -76/+76 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Renaming Rect -> Rectangle | Yann Bodson | 2009-08-19 | 8 | -76/+76 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-19 | 6 | -100/+37 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Doc clarification | Michael Brasser | 2009-08-19 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-08-19 | 7 | -37/+100 |
| |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxmouseregion.cpp | ||||
| * | | Various doc fixes. | Michael Brasser | 2009-08-19 | 6 | -99/+36 |
| | | | | | | | | | | | | Make QML docs fit in with the new Qt style. Fix numerous qdoc errors. | ||||
* | | | Small doc fixed for mouse handling. | Martin Jones | 2009-08-19 | 2 | -3/+10 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-19 | 3 | -1/+12 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-19 | 5 | -37/+85 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | doc fix | Yann Bodson | 2009-08-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update demos | Alan Alpert | 2009-08-19 | 2 | -0/+11 |
| | |/ | |/| | | | | | | | | | | | | | Remove uses of margin for positioners. Update MediaLineEdit to use a TextInput, in the process added a selectAll() slot to TextInput (like TextEdit has). | ||||
* | | | Fix containsMouse and clicking in general when acceptsHover is false. | Martin Jones | 2009-08-19 | 1 | -0/+4 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-19 | 15 | -544/+301 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-08-19 | 8 | -374/+136 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | These docs shouldn't have been removed | Alan Alpert | 2009-08-19 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | Still ought to have the docs that explain how to subclass QFxBasePositioner effectively, at least for internal reference. | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-19 | 5 | -134/+25 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | doc cleanup | Yann Bodson | 2009-08-19 | 1 | -29/+0 |
| | | | | |||||
| | | * | BorderImage doc | Yann Bodson | 2009-08-18 | 1 | -20/+6 |
| | | | | |||||
| | | * | doc cleanup | Yann Bodson | 2009-08-18 | 3 | -85/+19 |
| | | | | |||||
| | * | | More doc cleanup | Alan Alpert | 2009-08-18 | 1 | -80/+31 |
| | | | | | | | | | | | | | | | | | | | | Positioners now don't refer to 'laying out' nor to the removed properties, like margins. | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-18 | 24 | -642/+199 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxpositioners.cpp | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-18 | 28 | -222/+355 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |