diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp
index 96ca61871..35b420b56 100644
--- a/sources/qetdiagrameditor.cpp
+++ b/sources/qetdiagrameditor.cpp
@@ -95,7 +95,7 @@ QETDiagramEditor::QETDiagramEditor(const QStringList &files, QWidget *parent) :
 	m_workspace.setTabsClosable(true);
 
 		//Set the signal mapper
-	connect(&windowMapper, SIGNAL(mapped(QWidget *)), this, SLOT(activateWidget(QWidget *)));
+	connect(&windowMapper, SIGNAL(mapped(QWidget*)), this, SLOT(activateWidget(QWidget*)));
 
 	setWindowTitle(tr("QElectroTech", "window title"));
 	setWindowIcon(QET::Icons::QETLogo);
diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
index 076ba5c95..3e1744b91 100644
--- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
+++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
@@ -1001,11 +1001,16 @@ void QetGraphicsTableItem::adjustColumnsWidth()
 						m_header_item->minimumSectionWidth().at(at_b))+b);
 		sum_+= m_header_item->sectionSize(i);
 #else
-#if TODO_LIST
-#pragma message("@TODO remove code for QT 6 or later")
-#endif
-		qDebug()<<"Help code for QT 6 or later";
+		auto at_a = std::min(m_minimum_column_width.size()-1, (qsizetype) i);               //In case of the I is higher than m_minimum_column_width or
+		auto at_b = std::min(m_header_item->minimumSectionWidth().size()-1,(qsizetype) i); //m_header_item->minimumSectionWidth().size()
+		m_header_item->resizeSection(
+					i,
+					std::max(
+						m_minimum_column_width.at(at_a),
+						m_header_item->minimumSectionWidth().at(at_b))+b);
+		sum_+= m_header_item->sectionSize(i);
 #endif
+
 	}