diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
| commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
| tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /src/corelib/global/qfeatures.h | |
| parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
| parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) | |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/corelib/global/qfeatures.h')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index de45437959..ff6a8af873 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -597,6 +597,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 |