summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2715-78/+84
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-2712-61/+77
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-271-1/+1
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-2732-287/+450
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/extra/qmlbehavior.cpp src/declarative/extra/qmlbehavior.h
| | * | | Revert to Common.ImageDetails for now.Yann Bodson2009-08-271-1/+1
| | | | |
| | * | | Update .gitignore to show new files in declarative/examples and ↵Yann Bodson2009-08-271-0/+2
| | | | | | | | | | | | | | | | | | | | declarative/demos
| | * | | Doc fixesYann Bodson2009-08-272-2/+2
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-2710-70/+57
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Rename Behavior cpp class to match the QML name.Yann Bodson2009-08-278-58/+72
| | | | | |
| * | | | | Fix glitches when dragging a ListView.Martin Jones2009-08-272-16/+6
| | |_|_|/ | |/| | |
| * | | | Expressions should fail to evaluate if their engine has been destroyedAaron Kennedy2009-08-271-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | Changing this check to engine() checks both if the engine() exists and if the parent context exists.
* | | | Start adding convenience functions for value types.Michael Brasser2009-08-274-19/+145
| | | | | | | | | | | | | | | | | | | | Allows you to write things like "geometry: Qt.rect(0,0,100,100)" and "color: Qt.hsla(.7,.5,.2)"
* | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2716-204/+344
|\ \ \ \ | |/ / / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fixup 928e81b68e0b695662c7ee3dd0bfa409a7ca1ffdAaron Kennedy2009-08-272-15/+53
| | | | | | | | | | | | | | | | | | | | I messed up when I reapplied this patch to the branch head. This also adds an extra test for the case fixed.
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-08-2725-153/+163
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Implement Focus Scope support in GraphicsViewAaron Kennedy2009-08-2715-204/+306
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Focus Scopes are an additional focus paradigm, designed to be more suitable for use by declarative UI. With focus scopes, graphics view continues to have a single focused item - this is the single item to which key events are *actually* delivered. To simplify the description that follows, we will say that this element has "global focus". Focus scopes partitions focus into a heirarchy. Each focus scope may have one sub-focused item, which may itself be another focus scope. The sub-focused item is said to be have "scope focus" or its ancestor focus scope. Consequently, any given QGraphicsItem may be globally focused, scope focused (which means it is focused within its ancestor focus scope) or both. A focus scope corresponds to a QGraphicsItem with the ItemIsFocusScope flag set. As graphics view doesn't have a single root item, a "virtual" focus scope is modeled as being the ancestor of all the root items. With focus scopes, when QGraphicsItem::setFocus() is called, the item's ancestors are searched until a focus scope is found (remembering the "virtual" root focus scope is used if there is no *actual* ancestor scope). The item is set as the sub-focused item of the focus scope (becoming focus scoped) and any existing sub-focused item of that focus scope has scope focus removed from it. The item that receives global focus is found by beginning at the "virtual" root focus scope and recursively decending into each item that is scope focused until a leaf (non-focus scope) item is reached. The implementation takes shortcuts here to be slightly more optimal, but the end result should be the same as though this abstract algorithm was evaluated each time. Two manual examples of focus scope are found under examples/declarative/focusscope
* | | | Add internal note.Michael Brasser2009-08-271-1/+1
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2715-82/+70
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-2710-70/+57
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-272276-44172/+172804
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/anchor-layout.qdoc
| * | | Make QmlPropertyValueSource an interface.Martin Jones2009-08-2715-82/+70
| | | | | | | | | | | | | | | | 1st step in animation class heirarchy redesign.
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-2579-528/+1060
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Update docs to reflect layouts renamingMartin Jones2009-08-251-2/+2
| | | | |
* | | | | Support using a QAbstractItemModel with Repeater.Michael Brasser2009-08-271-1/+36
| |_|_|/ |/| | |
* | | | Repeater API updates.Michael Brasser2009-08-2710-70/+57
| |_|/ |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2729-121/+112
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-262240-44037/+172412
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-267-1/+260
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | doc fixesYann Bodson2009-08-269-56/+56
| | | | | |
| * | | | | doc fixesYann Bodson2009-08-261-19/+7
| | | | | |
| * | | | | Use Q_SLOTS and Q_SIGNALS.Yann Bodson2009-08-2613-16/+16
| | | | | |
| * | | | | doc fixesYann Bodson2009-08-263-21/+21
| | | | | |
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-265-8/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-251-6/+6
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | small flickr fixesYann Bodson2009-08-254-4/+4
| | | | | | |
| * | | | | | doc fixesYann Bodson2009-08-251-5/+8
| | | | | | |
* | | | | | | Fix potential crash on deletion.Michael Brasser2009-08-271-5/+6
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | If an item's parent is being destructed, no need to update anchors.
* | | | | | Fix unbalanced calls to QFxPixmapCache::get && cancelGetKai Koehne2009-08-265-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly track whether there is a QFxPixmapCache request pending, and only call QFxPixmapCache::cancelGet if this is the case. This should fix an issue in Bauhaus where multiple instances are loading the same image, and one instance calling cancelGet without ever having called get before is messing up the QFxPixmapCache request counting.
* | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-262242-44006/+172602
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2612-9/+274
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | Fix and test for multiple-access-to-same-URLWarwick Allison2009-08-267-1/+260
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Not reproduced (except by test), but may fix a Bauhaus issue.
| | * | | | Fix handling of empty strings for URLsWarwick Allison2009-08-264-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUrl resolves empty to base, which is not desirable. Preserve emptiness of QUrl. Handle use of empty QUrl with WebView (WebKit doesn't handle empty URLs well either).
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-256-7/+117
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Avoid shadowing QWebPage::view().Warwick Allison2009-08-252-4/+4
| | | | | |
| * | | | | Delete anchors when item is deleted.Michael Brasser2009-08-261-0/+1
| | | | | |
| * | | | | Some script engine cleanup.Michael Brasser2009-08-261-16/+1
| | | | | |
| * | | | | Fix compile after merge from 4.6.Michael Brasser2009-08-2526-28/+29
| | | | | |
| * | | | | Fix bad merge of QVector3D.Michael Brasser2009-08-252-10/+0
| | | | | |
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-252203-43937/+172291
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf tools/configure/configureapp.cpp
| | * | | | Make IDirectFBImageProvider enabled by defaultAnders Bakken2009-08-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent using IDirectFBImageProviders one can define QT_NO_DIRECTFB_IMAGEPROVIDER Reviewed-by: Donald Carr <donald.carr@nokia.com>
generated by cgit v0.12 at 2025-08-12 13:15:27 (GMT)