Hopefully last change for debugger columns fix.

There may be one more change if there's feedback for the code review
upstream.

3 files changed, 13 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71c6ddf19323..991987eb5bd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -43,7 +43,7 @@ pkgbase = qtcreator-fixed-themes
 	sha256sums = f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d
 	sha256sums = ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b
 	sha256sums = 12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f
-	sha256sums = 98daf0a116171270945e2403baf1799ce853859ee0af6dea58eb4519ba75683c
+	sha256sums = 91fd39966a8049d997de36d0cb2a7f04ae8d651f7c808f3359a1fe9d722dc4b7
 
 pkgname = qtcreator-fixed-themes
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c6c4327539c..332efc020660 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -46,7 +46,7 @@ sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
 			'f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d'
 			'ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b'
 			'12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f'
-			'98daf0a116171270945e2403baf1799ce853859ee0af6dea58eb4519ba75683c')
+			'91fd39966a8049d997de36d0cb2a7f04ae8d651f7c808f3359a1fe9d722dc4b7')
 
 prepare() {
   mkdir -p build
diff --git a/qtcreator-debugger-columns-fix.patch b/qtcreator-debugger-columns-fix.patch
index ac231ee67b65..8fd8d783de07 100644
--- a/qtcreator-debugger-columns-fix.patch
+++ b/qtcreator-debugger-columns-fix.patch
@@ -1,5 +1,5 @@
 diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
-index 8ced94f4ba..ed8f60bce8 100644
+index 8ced94f4ba..e27a65bb6f 100644
 --- a/src/plugins/debugger/debuggerengine.cpp
 +++ b/src/plugins/debugger/debuggerengine.cpp
 @@ -647,7 +647,7 @@ void DebuggerEnginePrivate::setupViews()
@@ -11,7 +11,16 @@ index 8ced94f4ba..ed8f60bce8 100644
      m_stackView->setModel(m_stackHandler.model());
      m_stackView->setSettings(settings, "Debugger.StackView");
      m_stackView->setIconSize(QSize(10, 10));
-@@ -720,6 +720,8 @@ void DebuggerEnginePrivate::setupViews()
+@@ -668,6 +668,8 @@ void DebuggerEnginePrivate::setupViews()
+ 
+     m_threadsView = new BaseTreeView;
+     m_threadsView->setModel(m_threadsHandler.model());
++    m_threadsView->header()->setStretchLastSection(false);
++    m_threadsView->header()->setSectionResizeMode(ThreadData::FunctionColumn, QHeaderView::Stretch);
+     m_threadsView->setSortingEnabled(true);
+     m_threadsView->setSettings(settings, "Debugger.ThreadsView");
+     m_threadsView->setIconSize(QSize(10, 10));
+@@ -720,6 +722,8 @@ void DebuggerEnginePrivate::setupViews()
              this, [this](bool on) { m_breakView->setColumnHidden(BreakpointAddressColumn, !on); });
      m_breakView->setSettings(settings, "Debugger.BreakWindow");
      m_breakView->setModel(m_breakHandler.model());