summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-144-0/+14
|\ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-134-0/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits) build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much ...
| | * Fix QT_NO_MOVIETasuku Suzuki2010-04-124-0/+14
| | | | | | | | | | | | | | | Merge-request: 2360 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* | | Reduce warnings at shutdownAaron Kennedy2010-04-141-1/+1
| | | | | | | | | | | | | | | | | | QTBUG-9799 Reviewed-by: Alexis Menard
* | | Image with PreserveAspect enabled with either width or height defined should ↵Joona Petrell2010-04-141-0/+6
| | | | | | | | | | | | | | | | | | | | | implicitly update the undefined axis to follow the aspect ratio Task-number: Reviewed-by: Martin Jones
* | | Merge branch '4.7' into reviews/2361Alexis Menard2010-04-1439-556/+1217
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.h
| * | | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-149-72/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a extension object to bring the anchors property for a QGraphicsWidget. The actual implement uses a separate object for storing the anchor pointer. In the future it would be nice if the extension object is the anchor itself. Also there are two connects extra for QGraphicsWidget one can perhaps disappear with a later commit. Only baseline case is not supported because QGraphicsWidget don't have any concept of baseline. Reviewed-by:akennedy
| * | | Doc fix.Michael Brasser2010-04-142-6/+6
| | | |
| * | | emit onMovementStarted/Ended/Changed on wheel eventsMartin Jones2010-04-141-0/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-9804
| * | | Complete item creation after its initial properties have been initialized.Martin Jones2010-04-141-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-9800
| * | | Don't crash when columns == 0Martin Jones2010-04-141-4/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-9805
| * | | Ensure view position is correct for highlight range modes that have a static ↵Martin Jones2010-04-132-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | highlight Task-number: QTBUG-9791
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-133-4/+4
| |\ \ \
| | * | | Struct -> class because class is better.Alexis Menard2010-04-133-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well i have no idea on what to write on that commit message. Reviewed-by:akennedy
| | * | | Move effect property where it should be.Alexis Menard2010-04-131-1/+0
| | |/ / | | | | | | | | | | | | Reviewed-by:leo
| * | | Improve efficiency of model dataChanged.Martin Jones2010-04-131-7/+8
| |/ /
| * | doc fixesYann Bodson2010-04-121-5/+15
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-121-0/+1
| |\ \
| | * | Doc: update Rectangle smooth painting screenshot.Yann Bodson2010-04-121-0/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-1229-504/+780
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/graphicsitems/qdeclarativetextinput_p.h
| | * | Fix PathView crash.Michael Brasser2010-04-121-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-9753
| | * | Improve font value type documentation.Yann Bodson2010-04-123-5/+316
| | | |
| | * | Remove QT_VERSION checks in QMLAaron Kennedy2010-04-092-4/+0
| | | | | | | | | | | | | | | | We only support Qt 4.7 now.
| | * | Small doc fix.Martin Jones2010-04-092-7/+7
| | | |
| | * | Enable other wrapping modes.Martin Jones2010-04-094-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word. WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
| | * | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-094-26/+56
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-094-362/+0
| | |\ \
| | | * | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-094-362/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit deletes the uneeded classes/declarations since we have now an inline support for QGraphicsObject based classes. QGraphicsLayout bindings works the same way because the layout property has been added to QGraphicsWidget. The only feature that is missing for now (because of the deletion of GraphicsObjectContainer) is the anchoring support. We will probably take a look on how to support this feature properly with no wrapper. Task-number:QTBUG-9456 Reviewed-by:Michael Brasser
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-093-19/+97
| | |\ \ \ | | | |/ /
| | | * | Make the TextInput element nicer. It has scrolling.Alexis Menard2010-04-093-19/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TextInput has support for scrolling now so it's quite usable. You can deactivate the auto scrolling with a property if you want to do crazy animation while scrolling. This commit also fixed several bugs with the current implementation especially regarding aligments : selection was broken, moving the cursor also -> fixed. I have also added a tiny fix when the TextInput lost the focus -> the selection is cleared. Task-number:QT-2745 Reviewed-by:Michael Brasser
| | * | | Ensure GridView content position is stable when moving items.Martin Jones2010-04-091-0/+2
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-9697
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-083-2/+7
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-083-3/+3
| | | |\ \
| | | * | | Fix AnimatedImage for remote image test. Fix and test sourceSize property.Warwick Allison2010-04-083-2/+7
| | | | | |
| | * | | | Calculate GridView columns regardless of whether we have a populated modelMartin Jones2010-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9692
| | * | | | Add highlightMoveDuration to views.Martin Jones2010-04-087-8/+131
| | | |/ / | | |/| | | | | | | | | | | | Task-number: QTBUG-7568
| | * | | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-083-3/+3
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-081-2/+0
| | |\ \
| | | * | Revert "Add QListModelInterface::modelReset() signal and emit this in"Bea Lam2010-04-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 973cfce37fcdd1ce330f237eaa76930db55a73f6. Need more consideration before adding modelReset(). For example if item insertion/removal is supposed to trigger animations through added/removed signals, they won't be triggered if only the modelReset() signal is emitted. Also if we add modelReset(), it should also be implemented for ListModel to make sure it is implemented by all subclasses of QListModelInterface and to test the impact of this on the view classes.
| | * | | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-083-24/+51
| | |/ / | | | | | | | | | | | | wrap remains for a little while, and will produce a warning.
| | * | Don't emit clicked() after pressAndHold()Martin Jones2010-04-081-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-9676
| | * | Update Repeater docs.Michael Brasser2010-04-071-5/+14
| | | |
| | * | Make sure Loader doesn't leak when component has errors.Michael Brasser2010-04-071-3/+3
| | | |
| | * | Fix warningMartin Jones2010-04-071-1/+1
| | | |
| | * | Disallow creation of attached objects Keys and KeyNavigationMartin Jones2010-04-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds qmlRegisterUncreatableType<>() to allow registration of named types that cannot be created. Task-number: QTBUG-9575
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-071-0/+2
| | |\ \
| | | * | Add QListModelInterface::modelReset() signal and emit this inBea Lam2010-04-071-0/+2
| | | |/ | | | | | | | | | | | | XmlListModel when all data has changed.
| | * | Keep track of the item count to avoid calling model->count() during batched ↵Martin Jones2010-04-073-22/+55
| | | | | | | | | | | | | | | | changes
| | * | Allow MouseArea.Drag.target to be reset.Martin Jones2010-04-072-1/+10
| | | | | | | | | | | | | | | | Task-number: QTBUG-9637
| | * | Document MouseEvent.accepted.Martin Jones2010-04-071-0/+11
| | | | | | | | | | | | | | | | Task-number: QTBUG-9639