summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-2612-67/+97
|\
| * BorderImage fails for .sci source containing a URLMartin Jones2011-01-211-5/+5
| | | | | | | | | | Task-number: QTBUG-16769 Reviewed-by: Bea Lam
| * positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-213-5/+5
| | | | | | | | | | | | | | | | | | We positioned the view beyond the bounds, which in some cases resulted in only one item being created. Combined with a bug in the bounds fixup very many items were created. Task-number: QT-4441 Reviewed-by: Michael Brasser
| * Revert "Fix loaded() signal to be emitted only once"Bea Lam2011-01-212-35/+27
| | | | | | | | | | | | | | | | | | This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768. QTBUG-16796 reports that this commit is causing regressions relating to initial sizing of items. Task-number: QTBUG-16796
| * TextEdit implicit size varied depending upon wrapMode.Martin Jones2011-01-191-2/+6
| | | | | | | | | | | | | | | | We failed to reset textWidth before calculating the ideal width of the text. Task-number: QTBUG-16710 Reviewed-by: Michael Brasser
| * Request font sizes with only 0.5pt resolution.Martin Jones2011-01-186-20/+54
| | | | | | | | | | | | | | | | When animating pointSize avoid generating a huge number of fonts with slightly different point sizes. Task-number: QTBUG-13960 Reviewed-by: Aaron Kennedy
* | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-245-33/+65
| |
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-2180-164/+199
|\ \ | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| * | Doc: Fixed QML syntax.David Boddie2011-01-192-15/+23
| | |
| * | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-173-11/+18
| | |
| * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1380-146/+175
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | * Doc: Fixed a few misspellings of FlipableThorbjørn Lindeijer2011-01-111-2/+2
| | |
| | * Update copyright year to 2011.Jason McDonald2011-01-1080-80/+80
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fix loaded() signal to be emitted only onceBea Lam2011-01-102-27/+35
| | | | | | | | | | | | | | | Task-number: QTBUG-16319 Reviewed-by: Martin Jones
| | * PathView crashed when the path is provided with undefined values.Martin Jones2011-01-061-1/+7
| | | | | | | | | | | | | | | Task-number: QTBUG-16356 Reviewed-by: Bea Lam
| | * PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the model is a VisualDataModel, the count will initally be zero and modelCount is not updated due to itemsInserted() before the component is completed. Task-number: QTBUG-16357 Reviewed-by: Bea Lam
| | * Doc fixes for introduction page and Item docsBea Lam2011-01-061-28/+0
| | | | | | | | | | | | | | | | | | | | | Moved 'Identity' and 'Property Change Signals' sections from Item docs to the intro page, which previously had a section on ids but this has been moved out of the 'Properties' section since an id isn't an ordinary property.
| | * Improve docs on attached properties on view delegates.Martin Jones2010-12-233-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Clarify that the properties are attached to the root of the delegate, and must be accessed as such by child items. Task-number: QTBUG-16193 Reviewed-by: Bea Lam
| | * Models which load incrementally via fetchMore() don't work.Martin Jones2010-12-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Call canFetchMore()/fetchMore() on setModel(), setRootIndex() and when the last item is created. Task-number: QTBUG-16039 Reviewed-by: Bea Lam
| | * Ensure PathView doesn't jump when starting to drag.Martin Jones2010-12-231-1/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-16133 Reviewed-by: Bea Lam
| | * Nested flickables would react alternately to flicks.Martin Jones2010-12-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | The grab was not always kept by filtering Flickables, but would remain set next flick, resulting in toggling of flicking. Task-number: QTBUG-16177 Reviewed-by: Michael Brasser
| | * Removing all visible items in ListView resulted in blank view.Martin Jones2010-12-221-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | When delayRemove is true and all visible items are tagged to be removed the visibleIndex became invalid and refill() began filling from 0. Task-number: QTBUG-16183 Reviewed-by: Michael Brasser
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-211-1/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits) Doc: Added a missing license header. doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable Doc: Added a note about the Public Suffix List. Doc: Fixed doc bug in Diagram Scene example doc: Removed some empty \row commands from a table. Doc: Added link to QML Basic Types in main Qt Quick page. Doc: Added missing What's New information for Qt 4.6 and 4.7. Doc: Fixed incorrect case in a page file name. Doc: Added a link to the QML Basic Types page. Doc: Removed duplicate external page reference. Doc: Fixed a link to the correct searchPaths() function. Doc: Added documentation about the use of null custom title bar widgets. Doc: Added a missing external page reference. Fixed the QML Focus document. Fixed snippets, images, and formatting. Added QML coding convention for "private" properties. Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc. Some whitespace fixes. Fixed a bug by changing the id name to lower case. ...
| * | \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-202-0/+4
| |\ \ \ | | |/ /
| | * | Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-202-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check bounds in TextInput and TextEdit. Task-number: QTBUG-16188 Reviewed-by: Bea Lam
| | * | Revert a fix made for bug QTBUG-15341Joona Petrell2010-12-142-15/+0
| | | | | | | | | | | | | | | | Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
| | * | Remove active selection when TextEdit loses focusJoona Petrell2010-12-142-0/+15
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15341 Reviewed-by: Yann Bodson
* | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-211-7/+7
| | | |
* | | | Doc: Fixed invalid QML snippets and marked up JavaScript correctly.David Boddie2011-01-201-33/+64
|/ / /
* | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-158-24/+51
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-137-21/+44
| |\ \ | | |/
| | * Ensure ListView contentHeight is set to a valid size.Martin Jones2010-12-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the view height is 0 no items will be created so the contentHeight can not be estimated. The currentItem is usually created, so it is possible to use that to estimate. Task-number: QTBUG-16037 Reviewed-by: Bea Lam
| | * Fix dragging Flickable back over start point.Martin Jones2010-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change 810e21d9e404aa2fcb602cb68bfd892387b234e7 caused regression. Once stealMouse is set to true is must stay that way until release. Task-number: QTBUG-15998 Reviewed-by: Michael Brasser
| | * A QAIM model resulted in items moving to incorrect locationsMartin Jones2010-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractItemModel moves items to the gaps between items. QML views assume items are moved to the destination index. This means we need to adjust the destination when moving forward to a gap. Task-number: QTBUG-15841 Reviewed-by: Michael Brasser
| | * PathView: removing the currentIndex could make it invalid.Martin Jones2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Removing the currentIndex could result in currentIndex being > than the number of items in the model. Task-number: QTBUG-15926 Reviewed-by: Michael Brasser
| | * Improvements to anchoring docsBea Lam2010-12-091-0/+2
| | | | | | | | | | | | | | | Make it clear that anchor margins only apply to anchors. Also document that anchor and absolute positioning cannot be mixed.
| | * Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-091-3/+7
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def
| | * | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-092-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases ListView and GridView would position the highlight despite highlightFollowsCurrentItem: false being specified. Task-number: QTBUG-15972 Reviewed-by: Michael Brasser
| | * | ListView: Fix calculation of currentItem position when out of view.Martin Jones2010-12-081-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The calculation of position of currentItem when it is out of the visible area was bogus. Task-number: QTBUG-15525 Reviewed-by: Bea Lam
| | * | Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A function resetCursorBlinkerTimer was introduced to QLineControl. Each time the cursor position in a textInput is updated, the blinker timer is reset. Task-number: QTBUG-15815 Reviewed-by: Martin Jones
| | * | Doc: make it clear that "z" affects sibling stacking order.Martin Jones2010-12-051-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-15802
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-081-3/+7
| |\ \ \ | | | |/ | | |/|
| | * | Don't emit activeFocusChanged() unless the active focus actually changedTor Arne Vestbø2010-12-071-3/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would previously call subFocusItemChanged(0) on the item as part of clearing the subfocus, even if the item in question would recieve a new subfocus item as part of setting the new subfocus. This resulted in the declarative item emitting activeFocusChanged(false) and then activeFocusChanged(true), which was affecting any animation or state bound to the activeFocus property of the item. We now stop clearing the subfocus when encountering an item that we know will get subfocus during the set-subfocus pass. We then set subfocus all the way to the root item, since the subfocus item itself might change. The effect of this is that the declarative item will only get one call to subFocusItemChanged(), passing the new subfocus item, instead of two. This means the declarative item can keep track of wherther ot not it had a subfocus item previously, and only emit activeFocusChanged() when the active focus goes from true to false or false to true. Task-number: QTBUG-15615 Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* | | Doc: Fixed an old-style float.David Boddie2010-12-151-1/+3
| | |
* | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-144-8/+24
| | |
* | | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-134-27/+9
|/ /
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-022-1/+9
|\ \ | |/
| * Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | | | | | | Task-number: QTBUG-15779 Reviewed-by: Martin Jones
| * Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| | | | | | | | | | | | | | | | The margins could overlap, which caused overpainting. Ensure the margins are always <= width or height /2. Task-number: QTBUG-14657 Reviewed-by: Yann Bodson
| * Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
| | | | | | | | | | Task-number: QTBUG-15250 Reviewed-by: Martin Jones
generated by cgit v0.12 at 2025-02-02 16:30:50 (GMT)