summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx
Commit message (Collapse)AuthorAgeFilesLines
* Fix compile after merge from 4.6.Michael Brasser2009-08-2520-20/+20
|
* Don't crash for QFxWebView::setUrl(QUrl)Kai Koehne2009-08-251-1/+1
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-254-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 Bodson2009-08-253-37/+237
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Implement QFxKeyNavigationAttached classAaron Kennedy2009-08-253-39/+142
| | | | | | | | | | | | Documentation is missing until we fix up focus behaviour
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-08-253-9/+18
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Add (non-functional) KeyNavigation typeAaron Kennedy2009-08-251-1/+98
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-252-7/+13
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Remove unnecessary KeysAttached static mapMartin Jones2009-08-252-7/+13
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-244-36/+52
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Fix list startPosition calculation.Martin Jones2009-08-241-2/+5
| | |/
| * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-247-83/+120
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Add missing CONSTANT to view property.Yann Bodson2009-08-241-1/+1
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-244-35/+48
|\ \ \ \ | | |_|/ | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Add a spacing property to ListViewMartin Jones2009-08-242-14/+41
| | | |
| * | | Fix onFooPressed key handlers.Martin Jones2009-08-242-21/+7
| | |/ | |/|
* | | Centralize QNetworkRequest attribute setting, turn on pipelining.Warwick Allison2009-08-242-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 Allison2009-08-241-2/+0
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-242-6/+23
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Remove duplicated signals.Michael Brasser2009-08-241-2/+0
| | |/ | |/|
* | | Rename positioners.Warwick Allison2009-08-244-75/+75
| | | | | | | | | | | | QFxBasePositioner still exists though.
* | | Special handling of Tab/BackTabWarwick Allison2009-08-242-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 WebViewSettingsWarwick Allison2009-08-242-6/+23
|/ | | | | More QML <-> JavaScript integration, with example. From Tapani Mikola
* Doc fix (Rect->Rectangle)Kai Koehne2009-08-211-2/+2
|
* Add MouseRegion::pressedButtons property. Update mouseX/Y when hovered.Martin Jones2009-08-212-8/+65
|
* Add font doc to TextInput and TextEdit.Yann Bodson2009-08-203-3/+13
|
* Update documentation regarding font.pointSizeYann Bodson2009-08-203-18/+18
|
* Basic types documentationYann Bodson2009-08-201-1/+1
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-208-76/+76
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Renaming Rect -> RectangleYann Bodson2009-08-198-76/+76
| |
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-196-100/+37
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Doc clarificationMichael Brasser2009-08-191-2/+2
| |
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-197-37/+100
| |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxmouseregion.cpp
| * | Various doc fixes.Michael Brasser2009-08-196-99/+36
| | | | | | | | | | | | Make QML docs fit in with the new Qt style. Fix numerous qdoc errors.
* | | Small doc fixed for mouse handling.Martin Jones2009-08-192-3/+10
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-193-1/+12
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-08-195-37/+85
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | doc fixYann Bodson2009-08-191-1/+1
| | | |
| * | | Update demosAlan Alpert2009-08-192-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 Jones2009-08-191-0/+4
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-1915-544/+301
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-198-374/+136
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * These docs shouldn't have been removedAlan Alpert2009-08-191-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 Alpert2009-08-195-134/+25
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * doc cleanupYann Bodson2009-08-191-29/+0
| | | |
| | | * BorderImage docYann Bodson2009-08-181-20/+6
| | | |
| | | * doc cleanupYann Bodson2009-08-183-85/+19
| | | |
| | * | More doc cleanupAlan Alpert2009-08-181-80/+31
| | | | | | | | | | | | | | | | | | | | Positioners now don't refer to 'laying out' nor to the removed properties, like margins.
| | * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-08-1824-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 Alpert2009-08-1828-222/+355
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui