diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 11:53:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 11:53:55 (GMT) |
| commit | 39a1a94bfdb7878afb351101aead2fbdcc871a25 (patch) | |
| tree | 2ff3ce739a18dd09432a7b79a8b39e4f9ec12616 /src | |
| parent | 97f268933a65cc3054c72748ff0b8b5042e70c2b (diff) | |
| parent | 72f3752b5b517c14e64c4e15d354ddf32e386c20 (diff) | |
| download | Qt-39a1a94bfdb7878afb351101aead2fbdcc871a25.zip Qt-39a1a94bfdb7878afb351101aead2fbdcc871a25.tar.gz Qt-39a1a94bfdb7878afb351101aead2fbdcc871a25.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Set the roleNames of proxy models to the roleNames of the source model.
Trying to make the animation autotests more robust
Remove `make check' logic from auto.pro.
Define a GNU-style `check' target for all projects.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/itemviews/qabstractproxymodel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/itemviews/qabstractproxymodel.cpp b/src/gui/itemviews/qabstractproxymodel.cpp index 40345a7..43a1327 100644 --- a/src/gui/itemviews/qabstractproxymodel.cpp +++ b/src/gui/itemviews/qabstractproxymodel.cpp @@ -127,6 +127,7 @@ void QAbstractProxyModel::setSourceModel(QAbstractItemModel *sourceModel) } else { d->model = QAbstractItemModelPrivate::staticEmptyModel(); } + d->roleNames = d->model->roleNames(); } /*! |