diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-12 01:09:44 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-12 01:09:44 (GMT) |
| commit | a19df56265e59bb26f927638aa5c75ccd666c388 (patch) | |
| tree | c3eb1175e4a59893bd3d0762207bb446405ea2b4 /src/declarative/util/qdeclarativeview.h | |
| parent | 6527735ff53a8ec593f5f85b037de46059e1207e (diff) | |
| parent | 1b2b9ba6b4cea31d679aeae915e590ddbf1da945 (diff) | |
| download | Qt-a19df56265e59bb26f927638aa5c75ccd666c388.zip Qt-a19df56265e59bb26f927638aa5c75ccd666c388.tar.gz Qt-a19df56265e59bb26f927638aa5c75ccd666c388.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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 |