diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index a8f276ed993..0545c785e75 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -310,6 +310,7 @@ bool BreakpointDialog::showDialog(BreakpointParameters *data)
     return true;
 }
 
+
 ///////////////////////////////////////////////////////////////////////
 //
 // BreakWindow
@@ -376,6 +377,14 @@ void BreakWindow::mouseDoubleClickEvent(QMouseEvent *ev)
     QTreeView::mouseDoubleClickEvent(ev);
 }
 
+void BreakWindow::setModel(QAbstractItemModel *model)
+{
+    QTreeView::setModel(model);
+    resizeColumnToContents(0); // Number
+    resizeColumnToContents(3); // Line
+    resizeColumnToContents(6); // Ignore count
+}
+
 void BreakWindow::contextMenuEvent(QContextMenuEvent *ev)
 {
     QMenu menu;
diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h
index 6faf84f3be0..e7ddbc0eb23 100644
--- a/src/plugins/debugger/breakwindow.h
+++ b/src/plugins/debugger/breakwindow.h
@@ -45,6 +45,7 @@ public:
     explicit BreakWindow(QWidget *parent = 0);
 
     static void editBreakpoint(BreakpointId id, QWidget *parent);
+    void setModel(QAbstractItemModel *model);
 
 private slots:
     void resizeColumnsToContents();
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index dc383ed956b..a2988b206ae 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -68,8 +68,6 @@ StackWindow::StackWindow(QWidget *parent)
     setIconSize(QSize(10, 10));
 
     header()->setDefaultAlignment(Qt::AlignLeft);
-    header()->resizeSection(0, 60);
-    header()->resizeSection(3, 60);
 
     connect(this, SIGNAL(activated(QModelIndex)),
         SLOT(rowActivated(QModelIndex)));
@@ -81,6 +79,7 @@ StackWindow::StackWindow(QWidget *parent)
         SLOT(reloadFullStack()));
     connect(debuggerCore()->action(MaximalStackDepth), SIGNAL(triggered()),
         SLOT(reloadFullStack()));
+    showAddressColumn(false);
 }
 
 void StackWindow::showAddressColumn(bool on)
@@ -93,6 +92,14 @@ void StackWindow::rowActivated(const QModelIndex &index)
     currentEngine()->activateFrame(index.row());
 }
 
+void StackWindow::setModel(QAbstractItemModel *model)
+{
+    QTreeView::setModel(model);
+    //resizeColumnsToContents();
+    resizeColumnToContents(0);
+    resizeColumnToContents(3);
+}
+
 void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
 {
     DebuggerEngine *engine = currentEngine();
diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h
index c19280215fc..75ea1c63858 100644
--- a/src/plugins/debugger/stackwindow.h
+++ b/src/plugins/debugger/stackwindow.h
@@ -53,6 +53,7 @@ private slots:
     void reloadFullStack();
 
 private:
+    void setModel(QAbstractItemModel *model);
     void contextMenuEvent(QContextMenuEvent *ev);
     void copyContentsToClipboard();
 
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index 5349204fbd5..df5dbfb07c3 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -37,6 +37,7 @@
 
 #include <utils/savedaction.h>
 
+#include <QtCore/QDebug>
 #include <QtGui/QContextMenuEvent>
 #include <QtGui/QHeaderView>
 #include <QtGui/QMenu>
@@ -69,6 +70,15 @@ void ThreadsWindow::rowActivated(const QModelIndex &index)
     debuggerCore()->currentEngine()->selectThread(index.row());
 }
 
+void ThreadsWindow::setModel(QAbstractItemModel *model)
+{
+    qDebug() << "SET MODEL";
+    QTreeView::setModel(model);
+    resizeColumnToContents(0); // Id
+    resizeColumnToContents(4); // Line
+    resizeColumnToContents(6); // Name
+}
+
 void ThreadsWindow::contextMenuEvent(QContextMenuEvent *ev)
 {
     QMenu menu;
diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h
index 0be2af6726b..473db93272d 100644
--- a/src/plugins/debugger/threadswindow.h
+++ b/src/plugins/debugger/threadswindow.h
@@ -51,6 +51,7 @@ private slots:
     void setAlternatingRowColorsHelper(bool on) { setAlternatingRowColors(on); }
 
 private:
+    void setModel(QAbstractItemModel *model);
     void contextMenuEvent(QContextMenuEvent *ev);
 
     bool m_alwaysResizeColumnsToContents;