diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp
index 4b7ee0a61fa..8253792c4a0 100644
--- a/src/libs/utils/basetreeview.cpp
+++ b/src/libs/utils/basetreeview.cpp
@@ -56,7 +56,7 @@ public:
 };
 
 BaseTreeView::BaseTreeView(QWidget *parent)
-    : QTreeView(parent)
+    : Utils::TreeView(parent)
 {
     setAttribute(Qt::WA_MacShowFocusRect, false);
     setFrameStyle(QFrame::NoFrame);
@@ -114,14 +114,14 @@ bool BaseTreeView::handleBaseContextAction(QAction *act)
 
 void BaseTreeView::setModel(QAbstractItemModel *model)
 {
-    QTreeView::setModel(model);
+    Utils::TreeView::setModel(model);
     if (header() && m_alwaysAdjustColumnsAction)
         setAlwaysResizeColumnsToContents(m_alwaysAdjustColumnsAction->isChecked());
 }
 
 void BaseTreeView::mousePressEvent(QMouseEvent *ev)
 {
-    QTreeView::mousePressEvent(ev);
+    Utils::TreeView::mousePressEvent(ev);
     if (!indexAt(ev->pos()).isValid())
         resizeColumnsToContents();
 }
@@ -147,7 +147,7 @@ void BaseTreeView::headerSectionClicked(int logicalIndex)
 
 void BaseTreeView::reset()
 {
-    QTreeView::reset();
+    Utils::TreeView::reset();
     if (header() && m_alwaysAdjustColumnsAction
             && m_alwaysAdjustColumnsAction->isChecked())
         resizeColumnsToContents();
diff --git a/src/libs/utils/basetreeview.h b/src/libs/utils/basetreeview.h
index a83076c95c9..e8bcdb132eb 100644
--- a/src/libs/utils/basetreeview.h
+++ b/src/libs/utils/basetreeview.h
@@ -32,11 +32,11 @@
 
 #include "utils_global.h"
 
-#include <QTreeView>
+#include "itemviews.h"
 
 namespace Utils {
 
-class QTCREATOR_UTILS_EXPORT BaseTreeView : public QTreeView
+class QTCREATOR_UTILS_EXPORT BaseTreeView : public Utils::TreeView
 {
     Q_OBJECT
 
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index f12a356fe4a..317d835726e 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -714,7 +714,7 @@ void BreakTreeView::keyPressEvent(QKeyEvent *ev)
                 update(id);
         }
     }
-    QTreeView::keyPressEvent(ev);
+    BaseTreeView::keyPressEvent(ev);
 }
 
 void BreakTreeView::mouseDoubleClickEvent(QMouseEvent *ev)
diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp
index d572789d04b..cbcff3bfdeb 100644
--- a/src/plugins/debugger/snapshotwindow.cpp
+++ b/src/plugins/debugger/snapshotwindow.cpp
@@ -77,7 +77,7 @@ void SnapshotTreeView::keyPressEvent(QKeyEvent *ev)
             if (idx.column() == 0)
                 removeSnapshot(idx.row());
     }
-    QTreeView::keyPressEvent(ev);
+    BaseTreeView::keyPressEvent(ev);
 }
 
 void SnapshotTreeView::contextMenuEvent(QContextMenuEvent *ev)
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index ba576a9ea7c..b3d033b4d35 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -994,7 +994,7 @@ void WatchTreeView::setModel(QAbstractItemModel *model)
             SLOT(handleItemIsExpanded(QModelIndex)));
 }
 
-void WatchTreeView::rowClicked(const QModelIndex &index)
+void WatchTreeView::rowActivated(const QModelIndex &index)
 {
     currentEngine()->watchDataSelected(currentEngine()->watchHandler()->watchData(index)->iname);
 }
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 052dfbc9239..f443fb481bf 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -51,7 +51,7 @@ public:
     explicit WatchTreeView(Type type, QWidget *parent = 0);
     Type type() const { return m_type; }
     void setModel(QAbstractItemModel *model);
-    void rowClicked(const QModelIndex &index);
+    void rowActivated(const QModelIndex &index);
     void reset();
 
 public slots: