diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
| commit | 015002fec9abff6a4c1bb3fa4b9de87279a079c3 (patch) | |
| tree | ad93af535a503d0a49d6c6367e990a8fbca163d3 /tests/auto/corelib/itemmodels | |
| parent | f1e00262321cc8daa3c7506153653453e2779886 (diff) | |
| parent | b9547af45ea2bbbc634722c1ef41afdb54216ce2 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
doc/global/template/style/online.css
mkspecs/android-g++/qmake.conf
Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61
Diffstat (limited to 'tests/auto/corelib/itemmodels')
| -rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index d5f976ed64..122427a021 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -3618,7 +3618,7 @@ class SignalArgumentChecker : public QObject Q_OBJECT public: SignalArgumentChecker(QAbstractItemModel *model, QAbstractProxyModel *proxy, QObject *parent = 0) - : QObject(parent), m_model(model), m_proxy(proxy) + : QObject(parent), m_proxy(proxy) { connect(model, SIGNAL(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)), SLOT(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int))); connect(model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), SLOT(rowsMoved(QModelIndex,int,int,QModelIndex,int))); @@ -3668,7 +3668,6 @@ private slots: } private: - QAbstractItemModel *m_model; QAbstractProxyModel *m_proxy; QPersistentModelIndex m_p1PersistentBefore; QPersistentModelIndex m_p2PersistentBefore; |