diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 13:14:16 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 13:14:16 (GMT) |
| commit | baecfbc7f7e0ec7edddb74a2e760c685977e9084 (patch) | |
| tree | f9071063e3b8dfcc1b2fcb3236be84fce5b17091 /src/gui/util/qscroller_p.h | |
| parent | bde58ad1e7d2b38d2882aaf869e93b0415128836 (diff) | |
| parent | f3ddd2d995b7485cdc1c3420d254499904ff9dd9 (diff) | |
| download | Qt-baecfbc7f7e0ec7edddb74a2e760c685977e9084.zip Qt-baecfbc7f7e0ec7edddb74a2e760c685977e9084.tar.gz Qt-baecfbc7f7e0ec7edddb74a2e760c685977e9084.tar.bz2 | |
Merge remote branch 'qt/4.8' into master-qml-staging
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
Diffstat (limited to 'src/gui/util/qscroller_p.h')
| -rw-r--r-- | src/gui/util/qscroller_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/util/qscroller_p.h b/src/gui/util/qscroller_p.h index 8c5f2e7..c119615 100644 --- a/src/gui/util/qscroller_p.h +++ b/src/gui/util/qscroller_p.h @@ -148,10 +148,6 @@ public slots: void targetDestroyed(); public: - // static - static QMap<QObject *, QScroller *> allScrollers; - static QSet<QScroller *> activeScrollers; - // non static QObject *target; QScrollerProperties properties; |