Maybe now the last debugger columns fix.

Based off code review feedback, though there might be more later.

3 files changed, 6 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 991987eb5bd6..0853cbafb376 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qtcreator-fixed-themes
 	pkgdesc = Lightweight, cross-platform integrated development environment, with fixes applied for various themes
 	pkgver = 4.8.0
-	pkgrel = 5
+	pkgrel = 6
 	url = http://qt-project.org
 	arch = x86_64
 	license = LGPL
@@ -43,7 +43,7 @@ pkgbase = qtcreator-fixed-themes
 	sha256sums = f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d
 	sha256sums = ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b
 	sha256sums = 12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f
-	sha256sums = 91fd39966a8049d997de36d0cb2a7f04ae8d651f7c808f3359a1fe9d722dc4b7
+	sha256sums = 739418bf1e54eff60ce419e9704511efda424c54741cbef3d8ea905644faaa91
 
 pkgname = qtcreator-fixed-themes
 
diff --git a/PKGBUILD b/PKGBUILD
index 332efc020660..3ad47fb93c2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=qtcreator-fixed-themes
 pkgver=4.8.0
 _clangver=7.0.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Lightweight, cross-platform integrated development environment, with fixes applied for various themes'
 arch=(x86_64)
 url='http://qt-project.org'
@@ -46,7 +46,7 @@ sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
 			'f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d'
 			'ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b'
 			'12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f'
-			'91fd39966a8049d997de36d0cb2a7f04ae8d651f7c808f3359a1fe9d722dc4b7')
+			'739418bf1e54eff60ce419e9704511efda424c54741cbef3d8ea905644faaa91')
 
 prepare() {
   mkdir -p build
diff --git a/qtcreator-debugger-columns-fix.patch b/qtcreator-debugger-columns-fix.patch
index 8fd8d783de07..2b3c26004b47 100644
--- a/qtcreator-debugger-columns-fix.patch
+++ b/qtcreator-debugger-columns-fix.patch
@@ -43,10 +43,10 @@ index 3f7b01d2bd..dfc5d6c0df 100644
      m_breakpointManagerWindow->setWindowTitle(tr("Breakpoint Preset"));
      m_breakpointManagerWindow->setObjectName(DOCKWIDGET_BREAKPOINTMANAGER);
 diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
-index 83e6af2829..bd14a327a6 100644
+index 83e6af2829..db9b1973d1 100644
 --- a/src/plugins/debugger/stackwindow.cpp
 +++ b/src/plugins/debugger/stackwindow.cpp
-@@ -32,33 +32,53 @@
+@@ -32,33 +32,52 @@
  #include <utils/savedaction.h>
  
  #include <QAction>
@@ -103,7 +103,6 @@ index 83e6af2829..bd14a327a6 100644
      resizeColumnToContents(StackLineNumberColumn);
 -    showAddressColumn(action(UseAddressInStackView)->isChecked());
 +    resizeColumnToContents(StackAddressColumn);
-+    resizeColumns();
 +    m_contentsAdjusted = true;
  }