summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove non-working scale-to-width code.Warwick Allison2009-05-081-5/+3
| | | | | This does not belong here. Zooming can be done by parent. Also, it doesn't work. (was previously also removed from QFxWebView)
* highlight color propertyWarwick Allison2009-05-083-0/+35
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0819-148/+525
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-088-68/+24
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * setWidth() and setHeight() lost their virtual at some point :-/Martin Jones2009-05-086-57/+15
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-083-7/+7
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-083-1/+2
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | More path to path fixing.Martin Jones2009-05-081-7/+5
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0814-34/+112
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Don't assume will get non-0 item to send key to.Ian Walters2009-05-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change was getting crashes when the window lost focus. This is because the target was non-0, but the focusItem stored for that target was 0.
| * | | | | Tweak debugger watchesAaron Kennedy2009-05-089-80/+499
| | |_|_|/ | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0814-34/+112
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Warn when dereferencing a non-existant nameAaron Kennedy2009-05-082-0/+2
| | |/ / | |/| |
* | | | Allow control of cursor and of selection.Warwick Allison2009-05-083-7/+46
| |/ / |/| | | | | | | | | | | This allows components to implement look&feel such as select-all-on-focus, and to blink the cursor even when it is a proxy that actually has focus.
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-076-9/+12
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Make sure cancelling image loading cancels progress reporting.Martin Jones2009-05-076-9/+12
| | |
* | | Fix double-click.Warwick Allison2009-05-071-1/+0
|/ /
* | Fix loading of components containing sub components through QmlDomKai Koehne2009-05-072-4/+3
| | | | | | | | | | Pass a (optional) url to QmlDomDocument::load so that the compiler can find referenced components
* | Get view to view transitions working properly... for PathView.Martin Jones2009-05-075-20/+97
|/
* Add property view to the debuggerAaron Kennedy2009-05-075-3/+205
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-075-20/+20
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0714-77/+368
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Use focus property, not active focus for control focusIan Walters2009-05-072-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | ActiveFocus is misleading in QML, between KeyProxy and FocusRealm, an item with focus, but not activeFocus could still get keys. focus means 'I want key events'. Hence if focus is true, blink the cursor.
| * | KeyProxy to send to focused child of focus realms.Ian Walters2009-05-073-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a component is loaded into a focus realm, it is likely when specifying it as a target of a focus proxy the intent is to have it behave as if the focus proxy target had focus. This means for focus scopes, descend to find the focused descendent of that scope, rather than sending directly to the item itself.
* | | Add a QmlDebuggerStatus interface elements can use to interact with the debuggerAaron Kennedy2009-05-0710-10/+193
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-076-34/+168
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-072-3/+14
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Don't crashMartin Jones2009-05-072-14/+15
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-074-12/+41
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Viewing the same image twice showed no image the second time.Martin Jones2009-05-071-0/+11
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0757-538/+833
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Add progress reporting to Image and use it in the flickr demo.Martin Jones2009-05-075-10/+86
| | | | |
| * | | | Doc.Martin Jones2009-05-061-11/+57
| | | | |
* | | | | Disable watcher table selectionAaron Kennedy2009-05-071-0/+1
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-072-3/+14
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-074-12/+41
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0717-233/+500
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Use correct 'from' value for repeating animations.Michael Brasser2009-05-072-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Each loop, we need to check whether the user has set a from value, and if not get the current value.
* | | | | Add "watchers" to debuggerAaron Kennedy2009-05-076-40/+185
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-073-11/+35
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0717-233/+500
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix QmlXmlListModel on property changes, on empty results.Warwick Allison2009-05-072-10/+34
| | | | | | | | | | | | | | | | | | | | Tags in flickr demo.
| * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0651-1260/+1535
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | default QGVWarwick Allison2009-05-061-1/+1
| | | | |
* | | | | Layouts should only modify items in their direction of operationAaron Kennedy2009-05-071-1/+6
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0753-1275/+1550
|\ \ \ \ | | |/ / | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fix typo.Michael Brasser2009-05-061-1/+1
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-0639-304/+332
| |\ \ \ | | |_|/ | |/| | | | | | kinetic-declarativeui
| | * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-0659-864/+1850
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | | * | Improved debug output for directfb:debugAnders Bakken2009-05-061-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include info on the primary surface pixelformat. Reviewed-by: TrustMe