diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
| commit | 124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (patch) | |
| tree | 518c22b7317c5646d2ce0adc5deb5818b2ea0af6 /src/declarative/util/qdeclarativeview.h | |
| parent | dcc9a7e72fe4c283df59378d08d75aecfa3b3b05 (diff) | |
| parent | ac519ee416e06f4ab471f102da306f94de21c90d (diff) | |
| download | Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.zip Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.gz Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
examples/declarative/dial/dial-example.qml
Diffstat (limited to 'src/declarative/util/qdeclarativeview.h')
| -rw-r--r-- | src/declarative/util/qdeclarativeview.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h index 3513c04..e9cff32 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -106,9 +106,8 @@ protected: virtual bool eventFilter(QObject *watched, QEvent *e); private: - friend class QDeclarativeViewPrivate; - QDeclarativeViewPrivate *d; Q_DISABLE_COPY(QDeclarativeView) + Q_DECLARE_PRIVATE(QDeclarativeView) }; QT_END_NAMESPACE |