Made adaptation to Qt6. Now it compiles without any errors and runs.

More work is required to get rid of Qt5Compat shims

src/CMakeLists.txt

@@ -13,11 +13,14 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(Qt5 COMPONENTS REQUIRED Core)
-find_package(Qt5 COMPONENTS REQUIRED Gui)
-find_package(Qt5 COMPONENTS REQUIRED Widgets)
-find_package(Qt5 COMPONENTS REQUIRED PrintSupport)
-find_package(Qt5 COMPONENTS REQUIRED Charts)
+
+
+find_package(Qt6 COMPONENTS REQUIRED Core)
+find_package(Qt6 COMPONENTS REQUIRED Gui)
+find_package(Qt6 COMPONENTS REQUIRED Widgets)
+find_package(Qt6 COMPONENTS REQUIRED Core5Compat)
+find_package(Qt6 COMPONENTS REQUIRED PrintSupport)
+find_package(Qt6 COMPONENTS REQUIRED Charts)
 
 set(HEADER_FILES
     GdbMonitor.h
@@ -194,7 +197,7 @@ set(SOURCE_FILES
     QImageViewer.cpp
     )
 
-qt5_add_resources(SOURCE_FILES resource.qrc)
+qt6_add_resources(SOURCE_FILES resource.qrc)
 
 # Set non-Debug build as GUI application.
 # Debug build remains consle application.
@@ -216,5 +219,5 @@ add_executable(${PROJECT_NAME} ${SYSTEM_TYPE} ${SOURCE_FILES})
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 
-target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Gui Qt5::Core Qt5::PrintSupport Qt5::Charts)
+target_link_libraries(${PROJECT_NAME} Qt6::Widgets Qt6::Gui Qt6::Core Qt6::PrintSupport Qt6::Charts Qt6::Core5Compat)
 

src/GdbMonitor.cpp

@@ -1,7 +1,7 @@
 #include "GdbMonitor.h"
 #include <QtCore/QtCore>
 #include <QtCore/QProcess>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QDebug>
 #include <iostream>
@@ -97,15 +97,15 @@ void GdbMonitor::handleReadyReadStandardOutput () {
             emit ampersandTextOutput(text);
         }else if (text[0] == '@') {
             emit atsignTextOutput(text);
-        }else if (text.contains(QRegExp("^([0-9]+)\\~"))) {
+        }else if (text.contains(QRegularExpression("^([0-9]+)\\~"))) {
             emit tildeTextOutput(text);
-        }else if (text.contains(QRegExp("^([0-9]+)\\="))) {
+        }else if (text.contains(QRegularExpression("^([0-9]+)\\="))) {
             emit equalTextOutput(text);
-        }else if (text.contains(QRegExp("^([0-9]+)\\*"))) {
+        }else if (text.contains(QRegularExpression("^([0-9]+)\\*"))) {
             emit astrixTextOutput(text);
-        }else if (text.contains(QRegExp("^([0-9]+)\\^"))) {
+        }else if (text.contains(QRegularExpression("^([0-9]+)\\^"))) {
             emit caretTextOutput(text);
-        }else if (text.contains(QRegExp("^([0-9]+)\\&"))) {
+        }else if (text.contains(QRegularExpression("^([0-9]+)\\&"))) {
             emit ampersandTextOutput(text);
         }else{
             emit textOutput(text);
@@ -132,15 +132,15 @@ void GdbMonitor::handleTextOutput (QString text) {
         emit caretTextOutput(text);
     }else if (text[0] == '&') {
         emit ampersandTextOutput(text);
-    }else if (text.contains(QRegExp("^([0-9]+)\\~"))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\~"))) {
         emit tildeTextOutput(text);
-    }else if (text.contains(QRegExp("^([0-9]+)\\="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\="))) {
         emit equalTextOutput(text);
-    }else if (text.contains(QRegExp("^([0-9]+)\\*"))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\*"))) {
         emit astrixTextOutput(text);
-    }else if (text.contains(QRegExp("^([0-9]+)\\^"))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^"))) {
         emit caretTextOutput(text);
-    }else if (text.contains(QRegExp("^([0-9]+)\\&"))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\&"))) {
         emit ampersandTextOutput(text);
     }else{
         emit textOutput(text);

src/QClearLineEdit.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QtWidgets/QLineEdit>
-#include <QtWidgets/QAction>
+#include <QAction>
 
 class QClearLineEdit : public QLineEdit {
 

src/QColorButton.cpp

@@ -6,7 +6,7 @@
 
 QColorButton::QColorButton(QWidget* parent) : QWidget(parent) {
 
-    _color = palette().color(QPalette::Background);
+    _color = palette().color(QPalette::Window);
 }
 
 QColorButton::QColorButton(const QColor& color, QWidget* parent) : QWidget(parent) {

src/QDetachTabWidget.cpp

@@ -1,7 +1,7 @@
 #include "QDetachTabWidget.h"
 #include <QtWidgets/QTabBar>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtGui/QCursor>
 #include <QtCore/QDebug>
 

src/QHistoryLineEdit.cpp

@@ -23,7 +23,7 @@
 #include <QtWidgets/QCompleter>
 #include <QtWidgets/QAbstractItemView>
 #include <QtWidgets/QScrollBar>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QWheelEvent>
 #include <QtCore/QDebug>
@@ -315,9 +315,9 @@ int QHistoryLineEdit::_wordStart () const {
 
     // lastIndexOf returns the index of the last space or -1 if there are no spaces
     // so that + 1 returns the index of the character starting the word or 0
-    int after_space = text().leftRef(cursorPosition()).lastIndexOf(' ') + 1;
+    int after_space = text().left(cursorPosition()).lastIndexOf(' ') + 1;
 
-    if ( text().rightRef(text().size()-after_space).startsWith(_completionPrefix) ) {
+    if ( text().right(text().size()-after_space).startsWith(_completionPrefix) ) {
         after_space += _completionPrefix.size();
     }
 

src/QProcessInfo.cpp

@@ -9,7 +9,8 @@
 #include "QProcessInfo.h"
 #include <QtCore/QDir>
 #include <QtCore/QProcess>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
+#include <QRegularExpression>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QTextStream>
 #include <QtCore/QDebug>
@@ -85,7 +86,7 @@ QProcessList QProcessInfo::populate() {
                         //qDebug() << line.split(QRegExp("\\s+")).at(0);
                         //qDebug() << line.split(QRegExp("\\s+")).at(1);
                         //qDebug() << "";
-                        info.setUsername(line.split(QRegExp("\\s+")).at(1));
+                        info.setUsername(line.split(QRegularExpression("\\s+")).at(1));
                         break;
                     }
                 }

src/QProcessInfoWidget.cpp

@@ -5,6 +5,7 @@
 #include <QtWidgets/QApplication>
 #include <QtGui/QFont>
 #include <QtCore/QDebug>
+#include <QRegularExpression>
 
 
 //
@@ -183,7 +184,7 @@ void QProcessInfoWidget::refreshView () {
     }else{
         // To find [xxx] processes   :  "^(\\[).*(\\])$"
         // To exclude [xxx] processes:  "^(?!\\[).*(?!\\])$"
-        processMatches = processTreeWidget->findItems("^(?!\\[).*(?!\\])$", Qt::MatchRegExp | Qt::MatchRecursive, 2);
+        processMatches = processTreeWidget->findItems("^(?!\\[).*(?!\\])$", Qt::MatchRegularExpression | Qt::MatchRecursive, 2);
         //qDebug() << "Checkbox is off." << processMatches.size();
     }
 

src/QZoomChart.h

@@ -2,8 +2,6 @@
 
 #include <QtCharts/QChart>
 
-using namespace QtCharts;
-
 class QGestureEvent;
 
 class QZoomChart : public QChart {

src/QZoomChartView.h

@@ -1,16 +1,15 @@
 #pragma once
 
+#include <QtCharts>
 #include <QtCharts/QChartView>
 #include <QtWidgets/QRubberBand>
 #include <QtCore/QPointF>
 
-using namespace QtCharts;
-
 class QZoomChartView : public QChartView {
 
     public:
         QZoomChartView (QWidget* parent = 0);
-        QZoomChartView (QtCharts::QChart* chart, QWidget* parent = 0);
+        QZoomChartView (QChart* chart, QWidget* parent = 0);
 
     public slots:
         void                    printView                   ();

src/SeerArrayVisualizerWidget.cpp

@@ -11,7 +11,8 @@
 #include <QtGui/QIcon>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
+#include <QRegularExpression>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
 #include <QtGlobal>
@@ -294,7 +295,7 @@ void SeerArrayVisualizerWidget::handleText (const QString& text) {
 
     //qDebug() << text;
 
-    if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         // 11^done,value="1"
         // 11^done,value="0x7fffffffd538"
@@ -355,7 +356,7 @@ void SeerArrayVisualizerWidget::handleText (const QString& text) {
             setBVariableAddress(address);
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,memory="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,memory="))) {
 
         // 3^done,memory=[{begin="0x0000000000613e70",offset="0x0000000000000000",end="0x0000000000613e71",contents="00"}]
         // 4^done,memory=[{begin="0x0000000000613e70",offset="0x0000000000000000",end="0x0000000000613ed4",contents="000000000000000000000000"}]
@@ -456,7 +457,7 @@ void SeerArrayVisualizerWidget::handleText (const QString& text) {
             }
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         // 12^error,msg="No symbol \"return\" in current context."
         // 13^error,msg="No symbol \"cout\" in current context."

src/SeerAsmWidget.cpp

@@ -73,9 +73,9 @@ void SeerAsmWidget::setData (const QString& data) {
         QString opcodes_text = Seer::parseFirst(asm_text, "opcodes=", '"', '"', false);
         QString inst_text    = Seer::parseFirst(asm_text, "inst=",    '"', '"', false);
 
-        address_width = std::max(address_width,address_text.length());
-        opcode_width  = std::max(opcode_width, opcodes_text.length());
-        inst_width    = std::max(inst_width,   inst_text.length());
+        address_width = std::max((qsizetype)address_width, address_text.length());
+        opcode_width  = std::max((qsizetype)opcode_width, opcodes_text.length());
+        inst_width    = std::max((qsizetype)inst_width,   inst_text.length());
     }
 
     // Write header.

src/SeerDirectoryFilterProxyModel.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtWidgets/QFileSystemModel>
+#include <QFileSystemModel>
 #include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QDebug>
 

src/SeerEditorManagerWidget.cpp

@@ -616,7 +616,7 @@ void SeerEditorManagerWidget::handleText (const QString& text) {
             b++;
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         // 10^done,value="1"
         // 11^done,value="0x7fffffffd538"
@@ -634,7 +634,7 @@ void SeerEditorManagerWidget::handleText (const QString& text) {
             assemblyWidget->handleText(text);
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         // 12^error,msg="No symbol \"return\" in current context."
         // 13^error,msg="No symbol \"cout\" in current context."

src/SeerEditorWidgetAssembly.cpp

@@ -9,7 +9,7 @@
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtGui/QTextCursor>
 #include <QtGui/QPalette>
 #include <QtCore/QList>
@@ -231,7 +231,7 @@ void SeerEditorWidgetAssembly::handleText (const QString& text) {
 
         return;
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         QString id_text    = text.section('^', 0,0);
         QString value_text = Seer::parseFirst(text, "value=", '"', '"', false);
@@ -251,7 +251,7 @@ void SeerEditorWidgetAssembly::handleText (const QString& text) {
             return;
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         QString id_text  = text.section('^', 0,0);
         QString msg_text = Seer::parseFirst(text, "value=", '"', '"', false);

src/SeerEditorWidgetAssembly.h

@@ -3,7 +3,7 @@
 #include "SeerCppSourceHighlighter.h"
 #include "SeerKeySettings.h"
 #include "SeerPlainTextEdit.h"
-#include <QtWidgets/QShortcut>
+#include <QShortcut>
 #include <QtWidgets/QWidget>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QResizeEvent>
@@ -82,7 +82,7 @@ class SeerEditorWidgetAssemblyArea : public SeerPlainTextEdit {
 
         void                                        showContextMenu                     (QMouseEvent* event);
         void                                        showContextMenu                     (QContextMenuEvent* event);
-        void                                        showContextMenu                     (const QPoint& pos, const QPoint& globalPos);
+        void                                        showContextMenu                     (const QPoint& pos, const QPointF& globalPos);
         void                                        setQuickBreakpoint                  (QMouseEvent* event);
 
         void                                        setHighlighterSettings              (const SeerHighlighterSettings& settings);

src/SeerEditorWidgetAssemblyAreas.cpp

@@ -14,7 +14,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtWidgets/QToolTip>
 #include <QtWidgets/QMessageBox>
 #include <QtGui/QTextCursor>
@@ -24,7 +24,7 @@
 #include <QtCore/QTextStream>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QDebug>
 
 //
@@ -590,7 +590,7 @@ void SeerEditorWidgetAssemblyArea::lineNumberAreaPaintEvent (QPaintEvent* event)
 
     QFont font = painter.font();
     font.setItalic(format.fontItalic());
-    font.setWeight(format.fontWeight());
+    font.setWeight(QFont::Weight(format.fontWeight()));
     painter.setFont(font);
 
     QTextBlock block       = firstVisibleBlock();
@@ -633,7 +633,7 @@ void SeerEditorWidgetAssemblyArea::offsetAreaPaintEvent (QPaintEvent* event) {
 
     QFont font = painter.font();
     font.setItalic(format.fontItalic());
-    font.setWeight(format.fontWeight());
+    font.setWeight(QFont::Weight(format.fontWeight()));
     painter.setFont(font);
 
     QTextBlock block       = firstVisibleBlock();
@@ -676,7 +676,7 @@ void SeerEditorWidgetAssemblyArea::breakPointAreaPaintEvent (QPaintEvent* event)
 
     QFont font = painter.font();
     font.setItalic(format.fontItalic());
-    font.setWeight(format.fontWeight());
+    font.setWeight(QFont::Weight(format.fontWeight()));
     painter.setFont(font);
 
     QTextBlock block       = firstVisibleBlock();
@@ -744,7 +744,7 @@ void SeerEditorWidgetAssemblyArea::opcodeAreaPaintEvent (QPaintEvent* event) {
 
     QFont font = painter.font();
     font.setItalic(format.fontItalic());
-    font.setWeight(format.fontWeight());
+    font.setWeight(QFont::Weight(format.fontWeight()));
     painter.setFont(font);
 
     QTextBlock block       = firstVisibleBlock();
@@ -1244,7 +1244,7 @@ bool SeerEditorWidgetAssemblyArea::breakpointAddressEnabled (const QString& addr
 
 void SeerEditorWidgetAssemblyArea::showContextMenu (QMouseEvent* event) {
 
-    showContextMenu(event->pos(), event->globalPos());
+    showContextMenu(event->pos(), event->globalPosition());
 }
 
 void SeerEditorWidgetAssemblyArea::showContextMenu (QContextMenuEvent* event) {
@@ -1252,7 +1252,7 @@ void SeerEditorWidgetAssemblyArea::showContextMenu (QContextMenuEvent* event) {
     showContextMenu(event->pos(), event->globalPos());
 }
 
-void SeerEditorWidgetAssemblyArea::showContextMenu (const QPoint& pos, const QPoint& globalPos) {
+void SeerEditorWidgetAssemblyArea::showContextMenu (const QPoint& pos, const QPointF& globalPos) {
 
     // Get the line number for the cursor position.
     QTextCursor cursor = cursorForPosition(pos);
@@ -1338,7 +1338,7 @@ void SeerEditorWidgetAssemblyArea::showContextMenu (const QPoint& pos, const QPo
     }
 
     // Launch the menu. Get the response.
-    QAction* action = menu.exec(globalPos);
+    QAction* action = menu.exec(globalPos.toPoint());
 
     // Do nothing.
     if (action == 0) {

src/SeerEditorWidgetSource.cpp

@@ -8,7 +8,7 @@
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtGui/QTextCursor>
 #include <QtGui/QPalette>
 #include <QtCore/QList>

src/SeerEditorWidgetSource.h

@@ -3,7 +3,7 @@
 #include "SeerCppSourceHighlighter.h"
 #include "SeerKeySettings.h"
 #include "SeerPlainTextEdit.h"
-#include <QtWidgets/QShortcut>
+#include <QShortcut>
 #include <QtWidgets/QWidget>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QResizeEvent>
@@ -77,7 +77,7 @@ class SeerEditorWidgetSourceArea : public SeerPlainTextEdit {
 
         void                                        showContextMenu                     (QMouseEvent* event);
         void                                        showContextMenu                     (QContextMenuEvent* event);
-        void                                        showContextMenu                     (const QPoint& pos, const QPoint& globalPos);
+        void                                        showContextMenu                     (const QPoint& pos, const QPointF& globalPos);
         void                                        setQuickBreakpoint                  (QMouseEvent* event);
 
         void                                        clearExpression                     ();

src/SeerEditorWidgetSourceAreas.cpp

@@ -14,7 +14,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtWidgets/QToolTip>
 #include <QtWidgets/QMessageBox>
 #include <QtGui/QTextCursor>
@@ -24,7 +24,7 @@
 #include <QtCore/QTextStream>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QDebug>
 
 SeerEditorWidgetSourceArea::SeerEditorWidgetSourceArea(QWidget* parent) : SeerPlainTextEdit(parent) {
@@ -228,7 +228,7 @@ void SeerEditorWidgetSourceArea::lineNumberAreaPaintEvent (QPaintEvent* event) {
 
     QFont font = painter.font();
     font.setItalic(format.fontItalic());
-    font.setWeight(format.fontWeight());
+    font.setWeight(QFont::Weight(format.fontWeight()));
     painter.setFont(font);
 
     QTextBlock block       = firstVisibleBlock();
@@ -265,7 +265,7 @@ void SeerEditorWidgetSourceArea::breakPointAreaPaintEvent (QPaintEvent* event) {
 
     QFont font = painter.font();
     font.setItalic(format.fontItalic());
-    font.setWeight(format.fontWeight());
+    font.setWeight(QFont::Weight(format.fontWeight()));
     painter.setFont(font);
 
     QTextBlock block       = firstVisibleBlock();
@@ -481,7 +481,7 @@ void SeerEditorWidgetSourceArea::mouseReleaseEvent (QMouseEvent* event) {
     }else if (modifiers == Qt::ShiftModifier) {
         _selectedExpressionName = QString("&") + textCursor().selectedText();
 
-    }else if (modifiers == (Qt::ShiftModifier + Qt::ControlModifier)) {
+    }else if (modifiers == (Qt::ShiftModifier | Qt::ControlModifier)) {
         _selectedExpressionName = QString("*&") + textCursor().selectedText();
 
     }else{
@@ -647,7 +647,7 @@ void SeerEditorWidgetSourceArea::openText (const QString& text, const QString& f
         delete _sourceHighlighter; _sourceHighlighter = 0;
     }
 
-    QRegExp cpp_re("(?:" + _sourceHighlighterSettings.sourceSuffixes() + ")$");
+    QRegularExpression cpp_re("(?:" + _sourceHighlighterSettings.sourceSuffixes() + ")$");
     if (file.contains(cpp_re)) {
         _sourceHighlighter = new SeerCppSourceHighlighter(0);
 
@@ -955,7 +955,7 @@ bool SeerEditorWidgetSourceArea::breakpointLineEnabled (int lineno) const {
 
 void SeerEditorWidgetSourceArea::showContextMenu (QMouseEvent* event) {
 
-    showContextMenu(event->pos(), event->globalPos());
+    showContextMenu(event->pos(), event->globalPosition());
 }
 
 void SeerEditorWidgetSourceArea::showContextMenu (QContextMenuEvent* event) {
@@ -963,7 +963,7 @@ void SeerEditorWidgetSourceArea::showContextMenu (QContextMenuEvent* event) {
     showContextMenu(event->pos(), event->globalPos());
 }
 
-void SeerEditorWidgetSourceArea::showContextMenu (const QPoint& pos, const QPoint& globalPos) {
+void SeerEditorWidgetSourceArea::showContextMenu (const QPoint& pos, const QPointF& globalPos) {
 
     // Get the line number for the cursor position.
     QTextCursor cursor = cursorForPosition(pos);
@@ -1129,7 +1129,7 @@ void SeerEditorWidgetSourceArea::showContextMenu (const QPoint& pos, const QPoin
     }
 
     // Launch the menu. Get the response.
-    QAction* action = menu.exec(globalPos);
+    QAction* action = menu.exec(globalPos.toPoint());
 
     // Do nothing.
     if (action == 0) {
@@ -1611,7 +1611,7 @@ void SeerEditorWidgetSourceArea::handleText (const QString& text) {
 
         return;
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         // 10^done,value="1"
         // 11^done,value="0x7fffffffd538"
@@ -1627,7 +1627,7 @@ void SeerEditorWidgetSourceArea::handleText (const QString& text) {
 
         return;
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         // 12^error,msg="No symbol \"return\" in current context."
         // 13^error,msg="No symbol \"cout\" in current context."

src/SeerExecutableFilterProxyModel.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtWidgets/QFileSystemModel>
+#include <QFileSystemModel>
 #include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QDebug>
 

src/SeerGdbLogWidget.cpp

@@ -1,7 +1,8 @@
 #include "SeerGdbLogWidget.h"
 #include "SeerUtl.h"
 #include <QtWidgets/QScrollBar>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
+#include <QRegularExpression>
 #include <QtCore/QDebug>
 
 SeerGdbLogWidget::SeerGdbLogWidget (QWidget* parent) : SeerLogWidget(parent) {
@@ -156,7 +157,7 @@ void SeerGdbLogWidget::processText (const QString& text) {
     //
     // Breakpoint 2 at 0x403a40: file explorer.cpp, line 78.
     //
-    if (str.contains(QRegExp("^Breakpoint ([0-9]+) at (0[xX][0-9a-fA-F]+): file (.*\\,) (line) ([0-9]+)"))) {
+    if (str.contains(QRegularExpression("^Breakpoint ([0-9]+) at (0[xX][0-9a-fA-F]+): file (.*\\,) (line) ([0-9]+)"))) {
         emit refreshBreakpointsList();
     }
 }

src/SeerHexWidget.cpp

@@ -521,7 +521,8 @@ void SeerHexWidget::handleByteOffsetChanged (int byte) {
 
                 unsigned char ch = Seer::ucharToAscii( arr[i] );
 
-                val += QString(ch);
+                QChar symbol = QChar(ch);
+                val += QString(symbol);
             }
 
         }else if (charMode() == SeerHexWidget::EbcdicCharMode) {
@@ -529,7 +530,8 @@ void SeerHexWidget::handleByteOffsetChanged (int byte) {
 
                 unsigned char ch = Seer::ebcdicToAscii( arr[i] );
 
-                val += QString(ch);
+                QChar symbol = QChar(ch);
+                val += QString(symbol);
             }
 
         }else{
@@ -648,7 +650,8 @@ void SeerHexWidget::create () {
 
                 unsigned char ch = Seer::ucharToAscii( data[b] );
 
-                QString val(ch);
+                QChar symbol = QChar(ch);
+                QString val(symbol);
 
                 // Write display character to document.
                 cursor.insertText (val, defaultFormat);
@@ -659,7 +662,8 @@ void SeerHexWidget::create () {
 
                 unsigned char ch = Seer::ebcdicToAscii( data[b] );
 
-                QString val(ch);
+                QChar symbol = QChar(ch);
+                QString val(symbol);
 
                 // Write display character to document.
                 cursor.insertText (val, defaultFormat);

src/SeerImageVisualizerWidget.cpp

@@ -7,7 +7,7 @@
 #include <QtGui/QIcon>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
 
@@ -131,7 +131,7 @@ void SeerImageVisualizerWidget::handleText (const QString& text) {
 
     //qDebug() << text;
 
-    if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         // 10^done,value="1"
         // 11^done,value="0x7fffffffd538"
@@ -149,7 +149,7 @@ void SeerImageVisualizerWidget::handleText (const QString& text) {
             setVariableAddress(words.first());
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,memory="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,memory="))) {
 
         // 3^done,memory=[{begin="0x0000000000613e70",offset="0x0000000000000000",end="0x0000000000613e71",contents="00"}]
         // 4^done,memory=[{begin="0x0000000000613e70",offset="0x0000000000000000",end="0x0000000000613ed4",contents="000000000000000000000000"}]
@@ -186,7 +186,7 @@ void SeerImageVisualizerWidget::handleText (const QString& text) {
             }
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         // 12^error,msg="No symbol \"return\" in current context."
         // 13^error,msg="No symbol \"cout\" in current context."

src/SeerMainWindow.cpp

@@ -13,7 +13,8 @@
 #include <QtGui/QPalette>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
+#include <QRegularExpression>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
 
@@ -863,16 +864,16 @@ void SeerMainWindow::handleText (const QString& text) {
     }else if (text.startsWith("^done,ada-exceptions={") && text.endsWith("}")) {
         return;
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done"))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done"))) {
         return;
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
         return;
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
         return;
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,memory="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,memory="))) {
         return;
 
     }else if (text == "^exit") {

src/SeerMainWindow.h

@@ -5,8 +5,8 @@
 #include "SeerKeySettings.h"
 #include "SeerProgressIndicator.h"
 #include <QtWidgets/QMainWindow>
-#include <QtWidgets/QShortcut>
-#include <QtWidgets/QActionGroup>
+#include <QShortcut>
+#include <QActionGroup>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QResizeEvent>
 #include <QtCore/QString>

src/SeerMemoryVisualizerWidget.cpp

@@ -7,7 +7,7 @@
 #include <QtGui/QIcon>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
 
@@ -26,7 +26,7 @@ SeerMemoryVisualizerWidget::SeerMemoryVisualizerWidget (QWidget* parent) : QWidg
     setWindowTitle("Seer Memory Visualizer");
     setAttribute(Qt::WA_DeleteOnClose);
 
-    memoryLengthLineEdit->setValidator(new QRegExpValidator(QRegExp("\\s*([1-9]\\d*\\s*)+"), this));
+    memoryLengthLineEdit->setValidator(new QRegularExpressionValidator(QRegularExpression("\\s*([1-9]\\d*\\s*)+"), this));
     columnCountSpinBox->setValue(memoryHexEditor->bytesPerLine());
 
     if (memoryHexEditor->memoryMode() == SeerHexWidget::HexMemoryMode) {
@@ -148,7 +148,7 @@ void SeerMemoryVisualizerWidget::handleText (const QString& text) {
 
     //qDebug() << text;
 
-    if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         // 11^done,value="1"
         // 11^done,value="0x7fffffffd538"
@@ -182,7 +182,7 @@ void SeerMemoryVisualizerWidget::handleText (const QString& text) {
             setVariableAddress(address);
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,memory="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,memory="))) {
 
         // 3^done,memory=[{begin="0x0000000000613e70",offset="0x0000000000000000",end="0x0000000000613e71",contents="00"}]
         // 4^done,memory=[{begin="0x0000000000613e70",offset="0x0000000000000000",end="0x0000000000613ed4",contents="000000000000000000000000"}]
@@ -219,7 +219,7 @@ void SeerMemoryVisualizerWidget::handleText (const QString& text) {
             }
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,asm_insns="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,asm_insns="))) {
 
         QString id_text = text.section('^', 0,0);
 
@@ -228,7 +228,7 @@ void SeerMemoryVisualizerWidget::handleText (const QString& text) {
             memoryAsmEditor->setData(text);
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         // 12^error,msg="No symbol \"return\" in current context."
         // 13^error,msg="No symbol \"cout\" in current context."

src/SeerPrintpointCreateDialog.cpp

@@ -219,7 +219,7 @@ QString SeerPrintpointCreateDialog::printpointText () const {
     printpointParameters += " ";
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-    if (format().front() != "\"") {
+    if (format().front() != QString("\"")) {
 #else
     if (format().at(0) != "\"") {
 #endif
@@ -229,7 +229,7 @@ QString SeerPrintpointCreateDialog::printpointText () const {
     printpointParameters += format();
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-    if (format().back() != "\"") {
+    if (format().back() != QString("\"")) {
 #else
     if (format().at(format().size() - 1) != "\"") {
 #endif

src/SeerProgressIndicator.cpp

@@ -1,6 +1,6 @@
 #include "SeerProgressIndicator.h"
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtGui/QCursor>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>

src/SeerSeerLogWidget.cpp

@@ -1,7 +1,7 @@
 #include "SeerSeerLogWidget.h"
 #include "SeerUtl.h"
 #include <QtWidgets/QScrollBar>
-#include <QtCore/QRegExp>
+#include <QRegularExpression>
 #include <QtCore/QDebug>
 
 SeerSeerLogWidget::SeerSeerLogWidget (QWidget* parent) : SeerLogWidget(parent) {
@@ -39,15 +39,15 @@ void SeerSeerLogWidget::processText (const QString& text) {
         selected = true;
     }
 
-    if (selected == false && text.contains(QRegExp("^([0-9]+)\\^")) == true) {
+    if (selected == false && text.contains(QRegularExpression("^([0-9]+)\\^")) == true) {
         selected = true;
     }
 
-    if (selected == false && text.contains(QRegExp("^([0-9]+)\\*")) == true) {
+    if (selected == false && text.contains(QRegularExpression("^([0-9]+)\\*")) == true) {
         selected = true;
     }
 
-    if (selected == false && text.contains(QRegExp("^([0-9]+)\\=")) == true) {
+    if (selected == false && text.contains(QRegularExpression("^([0-9]+)\\=")) == true) {
         selected = true;
     }
 

src/SeerStackArgumentsBrowserWidget.cpp

@@ -4,7 +4,7 @@
 #include <QtWidgets/QTreeWidgetItemIterator>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtCore/QDebug>
 
 SeerStackArgumentsBrowserWidget::SeerStackArgumentsBrowserWidget (QWidget* parent) : QWidget(parent) {

src/SeerStackLocalsBrowserWidget.cpp

@@ -4,7 +4,7 @@
 #include <QtWidgets/QTreeWidgetItemIterator>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtCore/QDebug>
 
 SeerStackLocalsBrowserWidget::SeerStackLocalsBrowserWidget (QWidget* parent) : QWidget(parent) {

src/SeerStructVisualizerWidget.cpp

@@ -4,9 +4,9 @@
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QTreeWidgetItemIterator>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtGui/QIcon>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QTime>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
@@ -85,7 +85,7 @@ void SeerStructVisualizerWidget::handleText (const QString& text) {
 
     QApplication::setOverrideCursor(Qt::BusyCursor);
 
-    if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         QString id_text    = text.section('^', 0,0);
         QString value_text = Seer::parseFirst(text,       "value=", '"', '"', false);
@@ -108,7 +108,7 @@ void SeerStructVisualizerWidget::handleText (const QString& text) {
         }
 
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         QString id_text  = text.section('^', 0,0);
         QString msg_text = Seer::parseFirst(text, "msg=", '"', '"', false);

src/SeerUtl.cpp

@@ -2,8 +2,9 @@
 #include <QtCore/QFile>
 #include <QtCore/QString>
 #include <QtCore/QDebug>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <mutex>
+#include <QRegularExpression>
 
 //
 // Increment this with every release on GitHub.
@@ -466,7 +467,9 @@ namespace Seer {
     bool matches (const QStringList& regexpatterns, const QString& string, QRegExp::PatternSyntax syntax) {
 
         foreach (const auto& regex, regexpatterns) {
-            if (string.contains(QRegExp(regex, Qt::CaseSensitive, syntax))) {
+            QRegExp regexPattern(regex, Qt::CaseSensitive, syntax);
+            QRegularExpression qt6Regex(regexPattern.pattern(), QRegularExpression::NoPatternOption );
+            if (string.contains(qt6Regex)) {
                 return true;
             }
         }

src/SeerUtl.h

@@ -2,7 +2,7 @@
 #include "QStringPair.h"
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 
 namespace Seer {
 

src/SeerVarVisualizerWidget.cpp

@@ -5,10 +5,10 @@
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QTreeWidgetItemIterator>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtWidgets/QMessageBox>
 #include <QtGui/QIcon>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QTimer>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
@@ -145,7 +145,7 @@ QString SeerVarVisualizerWidget::variableName () const {
 
 void SeerVarVisualizerWidget::handleText (const QString& text) {
 
-    if (text.contains(QRegExp("^([0-9]+)\\^done,name="))) {
+    if (text.contains(QRegularExpression("^([0-9]+)\\^done,name="))) {
 
         //
         // "-var-create x2112 "*" me"
@@ -223,7 +223,7 @@ void SeerVarVisualizerWidget::handleText (const QString& text) {
         }
 
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,numchild="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,numchild="))) {
 
         //
         // "-var-list-children --all-values x2112.public"
@@ -337,7 +337,7 @@ void SeerVarVisualizerWidget::handleText (const QString& text) {
         }
 
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,changelist="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,changelist="))) {
 
         //qDebug() << "var-update-children" << text;
 
@@ -415,7 +415,7 @@ void SeerVarVisualizerWidget::handleText (const QString& text) {
         }
 
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,attr="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,attr="))) {
 
         //qDebug() << "var-show-attributes" << text;
 
@@ -439,7 +439,7 @@ void SeerVarVisualizerWidget::handleText (const QString& text) {
         }
 
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         QString id_text  = text.section('^', 0,0);
         QString msg_text = Seer::parseFirst(text, "msg=", '"', '"', false);

src/SeerVariableLoggerBrowserWidget.cpp

@@ -3,7 +3,7 @@
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QTreeWidgetItemIterator>
 #include <QtWidgets/QApplication>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QTime>
 #include <QtCore/QDebug>
 
@@ -38,7 +38,7 @@ void SeerVariableLoggerBrowserWidget::handleText (const QString& text) {
 
     QApplication::setOverrideCursor(Qt::BusyCursor);
 
-    if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         //qDebug() << text;
 
@@ -56,7 +56,7 @@ void SeerVariableLoggerBrowserWidget::handleText (const QString& text) {
             }
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         //qDebug() << text;
 

src/SeerVariableTrackerBrowserWidget.cpp

@@ -3,7 +3,7 @@
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QTreeWidgetItemIterator>
 #include <QtWidgets/QApplication>
-#include <QtCore/QRegExp>
+#include <QtCore5Compat/QRegExp>
 #include <QtCore/QTimer>
 #include <QtCore/QDebug>
 #include <iostream>
@@ -122,7 +122,7 @@ void SeerVariableTrackerBrowserWidget::handleText (const QString& text) {
             qDeleteAll(matches);
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^done,value="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^done,value="))) {
 
         //qDebug() << text;
 
@@ -137,7 +137,7 @@ void SeerVariableTrackerBrowserWidget::handleText (const QString& text) {
             matches.first()->setText(2, Seer::filterEscapes(value_text));
         }
 
-    }else if (text.contains(QRegExp("^([0-9]+)\\^error,msg="))) {
+    }else if (text.contains(QRegularExpression("^([0-9]+)\\^error,msg="))) {
 
         //qDebug() << text;