summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers to release version.Jason McDonald2010-10-1879-1027/+1027
|
* Ensure PathView updates positions when path changes.Michael Brasser2010-10-082-2/+16
| | | | | | | | Fixes regression caused by optimization added in commit 35a51442ed21f58c06b21293eeb56e843251ee82. Task-number: QTBUG-14239 Reviewed-by: Martin Jones
* Use setParentItem() instead of setParentItemHelper if componentComplete is trueMarco Bubke2010-10-012-9/+34
| | | | | | | | | | | This ensures that if the component has already been completed, itemChange() is called. This is required to modify QDeclarativePositions in the visual editor, while keeping a legal state. Without this patch notifications are missing and the Positioner keeps track of already deleted children. This resulted in a crash. Reviewed-by: Thomas Hartmann (cherry picked from commit 1f8bb573f06234a3d13fb57de5eb644824d5024f)
* Add export to QDeclarativeBasePositionerMarco Bubke2010-10-011-1/+1
| | | | | Bauhaus needs this export to manage layouts. (cherry picked from commit 858469445ceb745c70dad9cd4f913acc34683e15)
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Jason McDonald2010-10-014-7/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones (cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae) Conflicts: tests/auto/declarative/qdeclarativeconnection/data/error-object.qml tests/auto/declarative/qdeclarativeconnection/data/error-property.qml tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp tests/auto/declarative/qdeclarativeqt/data/quit.qml tests/auto/declarative/qdeclarativeview/data/error1.qml
* Register QtQuick 1.0 module.Aaron Kennedy2010-10-011-20/+78
| | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799 (cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
* Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-10-011-1/+1
| | | | | Task-number: QTBUG-13893 (cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
* Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-231-3/+3
| | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones (cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
* Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-211-3/+5
| | | | | | | | | Check that we no longer hold a reference to the item before setting onPath to false. Task-number: QTBUG-13689 Reviewed-by: Michael Brasser (cherry picked from commit 7e6b2b2b95bc1db77544b898ec45ea4a2683e435)
* PathView didn't accept mouse events, preventing it from working in a Flickable.Martin Jones2010-09-212-75/+112
| | | | | | | | | | | | Since it didn't accept the press it didn't get a grab, so its events were always filtered away by Flickable. Use the same implementation as Flickable, i.e. create private handler functions for mouse events and accept normal events in the mouse*Event() methods. Task-number: QTBUG-13687 Reviewed-by: Michael Brasser (cherry picked from commit a4cadd1b1fd30a1989d56f6c06deb8fed4f79882)
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1611-130/+367
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-167-117/+215
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-159-31/+45
| | |\
| | * | Doc: Further QML improvements.David Boddie2010-09-151-22/+61
| | | |
| | * | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-151-2/+2
| | | |
| | * | Doc: Continued work on the QML documentation.David Boddie2010-09-141-10/+49
| | | |
| | * | Doc: More work on the QML documentation.David Boddie2010-09-141-57/+59
| | | |
| | * | Doc: More work on the declarative API documentation.David Boddie2010-09-135-26/+44
| | | |
| * | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-161-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Models with a single role also have a modelData property added. These role names both ended up in a hash, resulting in only one or the other updating. Now we handle modelData specially. Task-number: QTBUG-13664 Reviewed-by: Michael Brasser
| * | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This time the implementation of clear is correct Reviewed-by: Marco Bubke
| * | | Completing the interface for children/data/resourcesThomas Hartmann2010-09-144-3/+120
| | |/ | |/| | | | | | | | | | | | | | | | | | | This patch makes the handling of properties like children and data easier in Bauhaus. Especially in the case of property alias Reviewed-by: Aaron Kennedy
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-136-10/+24
|\ \ \ | |/ /
| * | When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-132-7/+16
| | | | | | | | | | | | | | | Task-number: QTBUG-12250 Reviewed-by: Michael Brasser
| * | Ensure flickable velocity is updated when view is moved by setCurrentIndexMartin Jones2010-09-134-3/+8
| | | | | | | | | | | | Task-number: QTBUG-13543
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-102-12/+14
|\ \ \ | |/ /
| * | Autotest for QTBUG-13454.Yann Bodson2010-09-101-2/+1
| | |
| * | Changing the Image 'source' should not go through the 'Loading' state if the ↵Yann Bodson2010-09-101-10/+13
| | | | | | | | | | | | | | | | | | | | | image is cached. Task-number: QTBUG-13454 Reviewed-by: Martin Jones
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0912-351/+521
|\ \ \ | |/ /
| * | Don't cause repaints during painting in Text elementMartin Jones2010-09-081-9/+7
| |/ | | | | | | | | | | | | | | | | | | Calling prepareGeometryChange in a paint event is a bad idea and was causing jerky scrolling. There is no longer any need for the removed code since we don't use imgCache.size() to determine boundingRect() anymore. Task-number: QTBUG-13453 Reviewed-by: Joona Petrell
| * Merge branch '4.7' into qmldocsDavid Boddie2010-09-075-150/+231
| |\
| * | Doc: More work on the QML documentation.David Boddie2010-09-072-22/+36
| | |
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-09-062-28/+30
| |\ \
| * | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-10/+19
| | | |
| * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-031-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| * | | | Doc: qdoc fixes.David Boddie2010-09-021-1/+1
| | | | |
| * | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-014-45/+45
| | | | |
| * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0126-283/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp
| * | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-011-5/+6
| | | | | |
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2713-75/+89
| |\ \ \ \ \
| * | | | | | Doc: More work on the QML documentation.David Boddie2010-08-273-204/+263
| | | | | | |
| * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-246-95/+85
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed incorrect use of commands to mark documentation.David Boddie2010-08-232-2/+0
| | | | | | | |
| * | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-233-61/+150
| | | | | | | |
* | | | | | | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-076-178/+261
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | ListView: Ensure highlight is positioned correctly in positionViewAtIndex().Martin Jones2010-09-071-15/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the currentItem position during flicking and avoid resizing the highlight on section boundaries. Task-number: QT-3870
| * | | | | | | Fix PathView item position on insertion and removal.Martin Jones2010-09-063-128/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the offset is adjusted to account for the new or removed items. Also minor optimizations to delegate updates. Task-number: QTBUG-13416
| * | | | | | | Do not reset sourceSize when changing image source url.Yann Bodson2010-09-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13383
| * | | | | | | Ensure all image state is updated before emitting changed signals.Martin Jones2010-09-061-5/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statusChanged() was emitted before the size was set, so if you did, e.g. if (width != 0) in onStatusChanged it would get the wrong width. Task-number: QT-3820 Reviewed-by: Yann Bodson
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-051-25/+23
| |\ \ \ \ \ \
| | * | | | | | Cleanup visible item checking in positionersAlan Alpert2010-09-031-25/+23
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially in Grid, where it wasn't being done right. Task-number: QTBUG-12610 Reviewed-by: Martin Jones
generated by cgit v0.12 at 2024-11-26 10:40:21 (GMT)