From 72ae95323a85f0d90ab23c7e85ee85ae6a17fd06 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 19 Nov 2013 00:19:06 +0100 Subject: [PATCH] Debugger: Re-enable thread view sorting This was disabled as workaround for QTCREATORBUG-7432 but can be supported again after fefbc172f. Task-number: QTCREATORBUG-7432 Change-Id: Ic85f6f91c0f6f04dc76f66984cb5773b0753ad26 Reviewed-by: Orgad Shaneh --- src/plugins/debugger/threadshandler.cpp | 8 ++++---- src/plugins/debugger/threadshandler.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp index e5f21ef2279..4996d34752a 100644 --- a/src/plugins/debugger/threadshandler.cpp +++ b/src/plugins/debugger/threadshandler.cpp @@ -36,6 +36,7 @@ #include #include +#include namespace Debugger { namespace Internal { @@ -136,8 +137,8 @@ ThreadsHandler::ThreadsHandler() { m_resetLocationScheduled = false; setObjectName(QLatin1String("ThreadsModel")); -// m_proxyModel = new QSortFilterProxyModel(this); -// m_proxyModel->setSourceModel(this); + m_proxyModel = new QSortFilterProxyModel(this); + m_proxyModel->setSourceModel(this); } int ThreadsHandler::currentThreadIndex() const @@ -489,8 +490,7 @@ void ThreadsHandler::resetLocation() QAbstractItemModel *ThreadsHandler::model() { - return this; - //return m_proxyModel; + return m_proxyModel; } } // namespace Internal diff --git a/src/plugins/debugger/threadshandler.h b/src/plugins/debugger/threadshandler.h index 2720ef4f119..1bf9ef6da9a 100644 --- a/src/plugins/debugger/threadshandler.h +++ b/src/plugins/debugger/threadshandler.h @@ -101,8 +101,7 @@ private: const QIcon m_emptyIcon; bool m_resetLocationScheduled; - - //QSortFilterProxyModel *m_proxyModel; + QSortFilterProxyModel *m_proxyModel; }; } // namespace Internal