Another update to debugger columns fix.

3 files changed, 15 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a621aea511f8..71c6ddf19323 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -43,7 +43,7 @@ pkgbase = qtcreator-fixed-themes
 	sha256sums = f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d
 	sha256sums = ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b
 	sha256sums = 12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f
-	sha256sums = 281ac6ba89038463ec48aee8a92bda2c10fa3697c80d4360099d99fdf79b3748
+	sha256sums = 98daf0a116171270945e2403baf1799ce853859ee0af6dea58eb4519ba75683c
 
 pkgname = qtcreator-fixed-themes
 
diff --git a/PKGBUILD b/PKGBUILD
index c865d35eef0b..3c6c4327539c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -46,7 +46,7 @@ sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
 			'f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d'
 			'ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b'
 			'12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f'
-			'281ac6ba89038463ec48aee8a92bda2c10fa3697c80d4360099d99fdf79b3748')
+			'98daf0a116171270945e2403baf1799ce853859ee0af6dea58eb4519ba75683c')
 
 prepare() {
   mkdir -p build
diff --git a/qtcreator-debugger-columns-fix.patch b/qtcreator-debugger-columns-fix.patch
index d81b99976b30..ac231ee67b65 100644
--- a/qtcreator-debugger-columns-fix.patch
+++ b/qtcreator-debugger-columns-fix.patch
@@ -20,6 +20,19 @@ index 8ced94f4ba..ed8f60bce8 100644
      m_breakView->setRootIsDecorated(true);
      m_breakWindow = addSearch(m_breakView);
      m_breakWindow->setObjectName(DOCKWIDGET_BREAK);
+diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
+index 3f7b01d2bd..dfc5d6c0df 100644
+--- a/src/plugins/debugger/debuggerplugin.cpp
++++ b/src/plugins/debugger/debuggerplugin.cpp
+@@ -1038,6 +1038,8 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
+     m_breakpointManagerView->setSettings(settings, "Debugger.BreakWindow");
+     m_breakpointManagerView->setRootIsDecorated(true);
+     m_breakpointManagerView->setModel(BreakpointManager::model());
++    m_breakpointManagerView->header()->setStretchLastSection(false);
++    m_breakpointManagerView->header()->setSectionResizeMode(BreakpointFunctionColumn, QHeaderView::Stretch);
+     m_breakpointManagerWindow = addSearch(m_breakpointManagerView);
+     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
 --- a/src/plugins/debugger/stackwindow.cpp