aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types
Commit message (Collapse)AuthorAgeFilesLines
* Fix null-pointer access in QQuickVisualDataModelPrivateFlorian Hänel2013-06-071-1/+2
| | | | | | | | | | I observed null cachItem->contextData which lead to null-pointer access on cacheItem->contextData->destroy(). Task-number: QTBUG-31439 Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Clarified members of QtQml.Models submodule.Jerome Pasion2013-06-044-60/+43
| | | | | | | | | | | | | | -Took out members of QtQml.Models submodule from Qt QML and Qt Quick. -Set up qdocconf files to include QtQml.Models to be part of Qt QML doc build. -Edited the sentences to make it clearer that list and model types are in QtQml.Models. -Placed the Visual* types back to QtQuick 2 module. -This patch removes several collision pages. Change-Id: I16e7045162af6852e5d6c3162b6f4cf97a42402b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Fix links for ListModel and ListElement typesTopi Reinio2013-05-291-2/+6
| | | | | | | Link to documentation under QtQml module. Change-Id: Id65d237558c235dcdda8ab206eddef23c2886a29 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Do not return cacheItem->object if it is still incubatingAlbert Astals Cid2013-05-231-3/+8
| | | | | | | | | | | | | | | | | | | | It can happen that cacheItem->object in QQmlDelegateModelPrivate::object already has a value but that the cacheItem->incubationTask is still Loading. If we return the object here we can confuse some of QQmlDelegateModel consumers like QQuickItemView. E.g. in QQuickItemView if we get to return the object before the createdItem signal is emitted we will make that when the createdItem signal happens QQuickItemView::createdItem will be called it will add the item to unrequestedItems items and will expect that layout/refill will remove it from unrequestedItems if it is really one of the items we are creating, but as it has been already created the item will wrongly remain in unrequestedItems making the item view to act weird Task-number: QTBUG-28403 Change-Id: I4359391eb2a4012afd3f01d082a99692d63b6639 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix comment: Signal is actually createdItem not itemCreatedAlbert Astals Cid2013-05-221-1/+1
| | | | | Change-Id: Ie2a259a02becdf6fb0c21d93013e0e3148187ed8 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Fixed a bunch of missing snippets.Jerome Pasion2013-05-151-4/+4
| | | | | | | | -moved delegate model related snippets from Qt Quick to Qt QML. -corrected snippet paths Change-Id: If688f97fb9317def16f343d5502a6a54d6761e95 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Make QQmlInstantiatorPrivate bools more space efficientAlan Alpert2013-05-091-5/+5
| | | | | Change-Id: Ie7a4951d66763c55148f02c6c88241c8ad363a90 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Fix Instantiator response to model changev5.1.0-beta1Alan Alpert2013-05-082-3/+8
| | | | | | | | | | | | | | Objects were not being created correctly when the model changed after componentComplete. After correcting that the model change can lead to an intermediate count change when the old model is cleared, so a flag is set to ignore intermediate changes fom the QQmlDelegateModel when the model changes. Task-number: QTBUG-30379 Change-Id: I55519c9ee378a1b0569567137ebd378f32a6c85c Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix crash in QQmlDelegateModelAlbert Astals Cid2013-05-031-3/+23
| | | | | | | | | | | | | | | | | | | | It can happen that when the QQmlDelegateModel goes away some of the QQmlDelegateModelItem from d->m_cache are still incubating, this means that isReferenced() will return true and we will not delete them. This also means that when these QQDMIncubationTask finish they may end up calling QQDMIncubationTask::statusChanged which will try to access the delegate model that is already gone. This commit makes sure we set vdm to 0 in these orphaned QQDMIncubationTask so in QQDMIncubationTask::statusChanged we know no one cares about us anymore and don't reference the already gone delegate model Task-number: QTBUG-30928 Change-Id: Ief6176cec151d861dad09ca2498ca27e17ee6385 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Avoid modifying cacheCount while iterating over itAlan Alpert2013-04-261-13/+16
| | | | | | | | | | | | | Because the cache items can be referenced in bindings, the last ref for the item can be cleared at any time due to JS ownership. This could modify the cache count while iterating over it. The removal from the cache list is now postponed until iteration is finished. All iteration cases can already handle an invalid cache item being found in the list. Task-number: QTBUG-30555 Change-Id: I1c0721b4d7e0dd69ce7a73824c1aa7b50d2c32a2 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Qt Quick: Fix module name format (Pt 1/2)Sze Howe Koh2013-04-233-6/+6
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Attempt to differentiate between the whole module ("Qt Quick") and the QML import ("QtQuick") by encoding the latter with monospace font. There are places in the text where both representations are valid. Change-Id: Id6e157a4191aaa4e23a9cd5c76abfe902fe43d33 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Prevent segfault on trying to access null cacheItem object.Mitch Curtis2013-04-221-0/+3
| | | | | | | | | | | | | In the situation mentioned in the bug report, a segfault occurs in QQmlDelegateModelPrivate::incubatorStatusChanged. This happens because cacheItem's object member is null but is still accessed several times. This patch adds a check for null before operating on the pointer. Task-number: QTBUG-29727 Change-Id: Ia4c0699442c6d0f50e090b401a58ed06c69b351a Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Doc: Qt QML: Fix module name formatSze Howe Koh2013-04-194-4/+5
| | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtQml -> Qt QML Change-Id: I45ca4496a02214feab48707b026c6bec085df138 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Reassigned types and pages to their correct modules.Jerome Pasion2013-04-173-7/+5
| | | | | | | | | | | | 1)Moved classes and basic types to \module QtQml 2. -QQml* classes are in QtQml 2 for 5.1 2)Removed \inqmlmodule commands in overviews and tutorials. -Only QML API should have \inqmlmodule commands because they are added to the auto generated list of types. Change-Id: I9aa3ca8062fa9fed76734885829879122841b119 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Add Instantiator type to QtQmlAlan Alpert2013-03-204-3/+663
| | | | | | | | | Provides a dynamic instantiation type which is not tied to visual items. Change-Id: I42f7332b29b752dcc94979b6e0ec191fc76b96ef Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Move QML types to types folderAlan Alpert2013-03-1423-0/+10405
The QtQml module has gain a bunch of QML types cluttering up the qml folder. Moving them to types organizes them a bit better. Change-Id: I570884c00f4abc48f4f1aea048bf002bc70223f3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 00:45:58 +0000