From 216a246daaf3e0b095c4e21efb738b0c7a084a32 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 09:31:58 +1000
Subject: Merge fix.

---
 src/declarative/util/qmlxmllistmodel_p.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 969afd1..50967a5 100644
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
@@ -132,9 +132,10 @@ class Q_DECLARATIVE_EXPORT QmlXmlListModelRole : public QObject
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QString query READ query WRITE setQuery)
+    Q_PROPERTY(bool isKey READ isKey WRITE setIsKey)
 
 public:
-    QmlXmlListModelRole() {}
+    QmlXmlListModelRole() : m_isKey(false) {}
     ~QmlXmlListModelRole() {}
 
     QString name() const { return m_name; }
@@ -150,6 +151,9 @@ public:
         m_query = query;
     }
 
+    bool isKey() const { return m_isKey; }
+    void setIsKey(bool b) { m_isKey = b; }
+
     bool isValid() {
         return !m_name.isEmpty() && !m_query.isEmpty();
     }
@@ -157,6 +161,7 @@ public:
 private:
     QString m_name;
     QString m_query;
+    bool m_isKey;
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12