Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove non-working scale-to-width code. | Warwick Allison | 2009-05-08 | 1 | -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 property | Warwick Allison | 2009-05-08 | 3 | -0/+35 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-08 | 19 | -148/+525 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-08 | 8 | -68/+24 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | setWidth() and setHeight() lost their virtual at some point :-/ | Martin Jones | 2009-05-08 | 6 | -57/+15 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-08 | 3 | -7/+7 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-08 | 3 | -1/+2 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | More path to path fixing. | Martin Jones | 2009-05-08 | 1 | -7/+5 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-08 | 14 | -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 Walters | 2009-05-08 | 1 | -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 watches | Aaron Kennedy | 2009-05-08 | 9 | -80/+499 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-08 | 14 | -34/+112 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Warn when dereferencing a non-existant name | Aaron Kennedy | 2009-05-08 | 2 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Allow control of cursor and of selection. | Warwick Allison | 2009-05-08 | 3 | -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 Allison | 2009-05-07 | 6 | -9/+12 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Make sure cancelling image loading cancels progress reporting. | Martin Jones | 2009-05-07 | 6 | -9/+12 |
| | | | |||||
* | | | Fix double-click. | Warwick Allison | 2009-05-07 | 1 | -1/+0 |
|/ / | |||||
* | | Fix loading of components containing sub components through QmlDom | Kai Koehne | 2009-05-07 | 2 | -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 Jones | 2009-05-07 | 5 | -20/+97 |
|/ | |||||
* | Add property view to the debugger | Aaron Kennedy | 2009-05-07 | 5 | -3/+205 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-07 | 5 | -20/+20 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-07 | 14 | -77/+368 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Use focus property, not active focus for control focus | Ian Walters | 2009-05-07 | 2 | -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 Walters | 2009-05-07 | 3 | -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 debugger | Aaron Kennedy | 2009-05-07 | 10 | -10/+193 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-07 | 6 | -34/+168 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-07 | 2 | -3/+14 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Don't crash | Martin Jones | 2009-05-07 | 2 | -14/+15 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-07 | 4 | -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 Jones | 2009-05-07 | 1 | -0/+11 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-07 | 57 | -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 Jones | 2009-05-07 | 5 | -10/+86 |
| | | | | | |||||
| * | | | | Doc. | Martin Jones | 2009-05-06 | 1 | -11/+57 |
| | | | | | |||||
* | | | | | Disable watcher table selection | Aaron Kennedy | 2009-05-07 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-07 | 2 | -3/+14 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-07 | 4 | -12/+41 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-07 | 17 | -233/+500 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Use correct 'from' value for repeating animations. | Michael Brasser | 2009-05-07 | 2 | -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 debugger | Aaron Kennedy | 2009-05-07 | 6 | -40/+185 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-07 | 3 | -11/+35 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-07 | 17 | -233/+500 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Fix QmlXmlListModel on property changes, on empty results. | Warwick Allison | 2009-05-07 | 2 | -10/+34 |
| | | | | | | | | | | | | | | | | | | | | Tags in flickr demo. | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-06 | 51 | -1260/+1535 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | default QGV | Warwick Allison | 2009-05-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Layouts should only modify items in their direction of operation | Aaron Kennedy | 2009-05-07 | 1 | -1/+6 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-07 | 53 | -1275/+1550 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Fix typo. | Michael Brasser | 2009-05-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-06 | 39 | -304/+332 |
| |\ \ \ | | |_|/ | |/| | | | | | | kinetic-declarativeui | ||||
| | * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-05-06 | 59 | -864/+1850 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp | ||||
| | | * | | Improved debug output for directfb:debug | Anders Bakken | 2009-05-06 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include info on the primary surface pixelformat. Reviewed-by: TrustMe |