diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp
index 70dbf3eed..a1267ab28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp
@@ -7,7 +7,6 @@
 #include <QPushButton>
 #include <QMessageBox>
 #include <QStyle>
-#include <QDesktopWidget>
 #include <QFile>
 #include <QCheckBox>
 #include <QProcess>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/detailview.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/detailview.cpp
index 97cbf5a38..43dfba007 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/detailview.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/detailview.cpp
@@ -21,6 +21,7 @@
 #include <QTabWidget>
 #include <QPushButton>
 #include <QMouseEvent>
+#include <QRegularExpression>
 
 #include <limits>
 #include <functional>
@@ -632,7 +633,7 @@ QWidget *DetailView::createWidget(const RwMode &readOnly,
   case dds::core::xtypes::TypeKind::STRUCTURE_TYPE:
   {
     //noNaming = true;
-    g = name.contains(QRegExp(QLatin1String(".([0-9]*)$"))) ? new QWidget(parent) : new QGroupBox(name, parent);
+    g = name.contains(QRegularExpression(QLatin1String(".*([0-9]*)$"))) ? new QWidget(parent) : new QGroupBox(name, parent);
 
     QGridLayout *gl = new QGridLayout(g);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/sequences/abstractsequencewidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/sequences/abstractsequencewidget.cpp
index 1ba27e585..7ec7f3b31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/sequences/abstractsequencewidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/sequences/abstractsequencewidget.cpp
@@ -8,6 +8,7 @@
   */
 #include "abstractsequencewidget.h"
 
+#include <QRegularExpression>
 #include <QToolButton>
 
 AbstractSequenceWidget::AbstractSequenceWidget(const RwMode &readOnly,
@@ -164,7 +165,7 @@ void AbstractSequenceWidget::deleteMemberWidget(QObject *member)
 
       QString childName = child->objectName();
       QString newId = m_name + QLatin1Char('.') + QString::number(i + 1);
-      child->setObjectName(childName.replace(QRegExp(m_name + QLatin1String(".([0-9]*)")), newId));
+      child->setObjectName(childName.replace(QRegularExpression(QRegularExpression::escape(m_name + QLatin1String(".") + "([0-9]*)")), newId));
       DEBUG_LOG(m_logger) << "new child name: " << child->objectName();
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/sortfiltermodel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/sortfiltermodel.cpp
index 5bfd35291..fa66f5c4e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/sortfiltermodel.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/sortfiltermodel.cpp
@@ -10,7 +10,7 @@
 #include "sortfiltermodel.h"
 #include "logviewtablemodel.h"
 
-#include <QRegExp>
+#include <QRegularExpression>
 
 void SortFilterModel::setStartDateFilter(const QDateTime &start)
 {
@@ -52,8 +52,8 @@ void SortFilterModel::setStringFilter(int col, const QString &filter)
 
   if (m_stringFilter.contains(col))
   {
-    QRegExp currentFilter(m_stringFilter[col], Qt::CaseInsensitive, QRegExp::FixedString);
-    if (currentFilter.exactMatch(filter))
+    QRegularExpression currentFilter(QRegularExpression::escape(m_stringFilter[col]), QRegularExpression::CaseInsensitiveOption);
+    if (currentFilter.match(filter).hasMatch())
       return;
     else
       m_stringFilter.insert(col, filter);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp
index 5b5fdc13d..e79b5db71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp
@@ -9,7 +9,7 @@
 #include <QGraphicsDropShadowEffect>
 #include <QListWidgetItem>
 #include <QMessageBox>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QShortcut>
 #include <QThread>
 
@@ -158,7 +158,7 @@ void BrowserWnd::slotNewTableList(QStringList tables)
 {
   if (!m_ui->leFilter->text().isEmpty()) // filter when there is a filter
   {
-    QRegExp regExp(m_ui->leFilter->text(), Qt::CaseInsensitive, QRegExp::Wildcard);
+    QRegularExpression regExp(QRegularExpression::wildcardToRegularExpression(m_ui->leFilter->text()), QRegularExpression::CaseInsensitiveOption);
     tables = tables.filter(regExp);
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt
index 1f36175fc..9e1faee3b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt
@@ -22,6 +22,7 @@ NGL_TARGET_LINK_LIBRARIES(textEditorTest
   nglsettings
   nglwidgets
   Qt6::Core
+  Qt6::Core5Compat
   Qt6::Gui
   Qt6::Widgets
   Qt6::Xml
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp
index 55c116413..de9209f02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp
@@ -65,7 +65,7 @@ QVector<QMap<QString, QString>> HTTPRequestHandler::getParams(const QString &gro
     QByteArray replyBytes = reply->readAll();
     QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
     QRegularExpression re(QLatin1String("(\\w++=[^_]++)"));
-    const QVector<QStringRef> replyList = replyText.splitRef(QRegExp(QLatin1String("\n|\r\n|\r")));
+    const QVector<QStringRef> replyList = replyText.splitRef(QRegularExpression(QLatin1String("\n|\r\n|\r")));
     QMap<QString, QString> paramMap;
     for (const QStringRef &string : replyList)
     {
@@ -92,7 +92,7 @@ void HTTPRequestHandler::removeParams(const QString &groupName, QNetworkAccessMa
   QByteArray replyBytes = reply->readAll();
   QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size());
   QRegularExpression re(QLatin1String("(\\b\\w{2}\\b)"));
-  const QVector<QStringRef> replyList = replyText.splitRef(QRegExp(QLatin1String("\n|\r\n|\r")));
+  const QVector<QStringRef> replyList = replyText.splitRef(QRegularExpression(QLatin1String("\n|\r\n|\r")));
   QStringList tempList;
   for (const QStringRef &string : replyList)
   {
@@ -133,7 +133,7 @@ int HTTPRequestHandler::getAmount(const QString &groupName, QNetworkAccessManage
   QByteArray replyBytes = reply->readAll();
   QString bytesString = QString::fromUtf8(replyBytes.data(), replyBytes.size());
   QString replyText = QVariant(bytesString).toString();
-  QStringList replyList = replyText.split(QRegExp(QLatin1String("\n|\r\n|\r")));
+  QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r")));
   reply->deleteLater();
   return replyList.count() - 1;
 }