aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2011-06-29 17:18:19 +1000
committerAndrew den Exter <andrew.den-exter@nokia.com>2011-06-29 17:18:19 +1000
commitc0fd56243fd622ae0e077a1473fc066ebf424bc7 (patch)
treeb134c4b8d928a0b1c95ad060eaf95fbeab40dddc
parentb961cb8f0d7d69c0343dd18a442be240fa178bf7 (diff)
Enable caching of visual role properties.
Put VDMDelegateDataType in a namespace so it doesn't link against the same class in qdeclarativevisualitemmodel.cpp
-rw-r--r--examples/declarative/modelviews/visualdatamodel/Bubble.qml3
-rw-r--r--src/declarative/items/qsgvisualitemmodel.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/examples/declarative/modelviews/visualdatamodel/Bubble.qml b/examples/declarative/modelviews/visualdatamodel/Bubble.qml
index da41af8a47..dff5bd3e30 100644
--- a/examples/declarative/modelviews/visualdatamodel/Bubble.qml
+++ b/examples/declarative/modelviews/visualdatamodel/Bubble.qml
@@ -6,7 +6,8 @@ Rectangle {
property int contentHeight: height - senderText.implicitHeight - 2
function send() {
- state = "sending"
+ message = editorLoader.item.text
+ delegateState = "sending"
root.sending()
}
diff --git a/src/declarative/items/qsgvisualitemmodel.cpp b/src/declarative/items/qsgvisualitemmodel.cpp
index 3a3b1596f8..feecbe5b92 100644
--- a/src/declarative/items/qsgvisualitemmodel.cpp
+++ b/src/declarative/items/qsgvisualitemmodel.cpp
@@ -70,6 +70,7 @@ QT_BEGIN_NAMESPACE
QHash<QObject*, QSGVisualModelAttached*> QSGVisualModelAttached::attachedProperties;
+namespace {
class VDMDelegateDataType : public QDeclarativeOpenMetaObjectType
{
public:
@@ -81,6 +82,7 @@ public:
bool m_caching;
};
+}
class QSGVisualModelPartsMetaObject : public QDeclarativeOpenMetaObject
{