summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsh kim <sukhyun.kim@nokia.com>2012-03-15 11:11:51 +0900
committerQt by Nokia <qt-info@nokia.com>2012-03-19 20:16:04 +0100
commitd1fb20943d556db63c43d9bca9ebe2c9df6c11a3 (patch)
treebf5588bf19ae1f7756a6c2c333ce3d84b22a517b
parent9ea1d51c481f0b400e4d2609d62a664035395857 (diff)
Add IDENTITYPROXYMODEL feature
Change-Id: Ic92165b2ab06e5b5f733bfaf2f7fe908861c0efa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--src/corelib/global/qfeatures.h5
-rw-r--r--src/corelib/global/qfeatures.txt7
2 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index db7ff04bb2..15d5a9db66 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -602,6 +602,11 @@
#define QT_NO_DATAWIDGETMAPPER
#endif
+// QIdentityProxyModel
+#if !defined(QT_NO_IDENTITYPROXYMODEL) && (defined(QT_NO_PROXYMODEL))
+#define QT_NO_IDENTITYPROXYMODEL
+#endif
+
// QListWidget
#if !defined(QT_NO_LISTWIDGET) && (defined(QT_NO_LISTVIEW))
#define QT_NO_LISTWIDGET
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 444a23b0e3..cc0594b62a 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -704,6 +704,13 @@ Requires: PROXYMODEL
Name: QSortFilterProxyModel
SeeAlso: ???
+Feature: IDENTITYPROXYMODEL
+Description: Supports proxying a source model unmodified.
+Section: ItemViews
+Requires: PROXYMODEL
+Name: QIdentityProxyModel
+SeeAlso: ???
+
Feature: STRINGLISTMODEL
Description: Supports a model that supplies strings to views.
Section: ItemViews