From 9e28474e47d1cdcb432bb43b32b06f693f4fca3f Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sat, 25 Jul 2020 20:04:22 +0200
Subject: rbutil: Replace QRegExp with QRegularExpression.

The former is not part of Qt6 anymore, while the latter has been
introduced with Qt5. We don't support Qt4 anymore, so move to
QRegularExpression.

Change-Id: Icc15ef422790f3740660c5581294aa0536f46b1f
---
 utils/rbutilqt/gui/changelog.cpp              | 6 +++---
 utils/rbutilqt/gui/selectiveinstallwidget.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'utils/rbutilqt/gui')

diff --git a/utils/rbutilqt/gui/changelog.cpp b/utils/rbutilqt/gui/changelog.cpp
index 79d601e412..9005b9e474 100644
--- a/utils/rbutilqt/gui/changelog.cpp
+++ b/utils/rbutilqt/gui/changelog.cpp
@@ -60,10 +60,10 @@ QString Changelog::parseChangelogFile(QString filename)
             line = c.readLine();
             text.append("<ul>");
             while(line.startsWith("*")) {
-                QString t = line.remove(QRegExp("^\\*"));
-                t.replace(QRegExp("FS#(\\d+)"),
+                QString t = line.remove(QRegularExpression("^\\*"));
+                t.replace(QRegularExpression("FS#(\\d+)"),
                           "<a href='http://www.rockbox.org/tracker/task/\\1'>FS#\\1</a>");
-                t.replace(QRegExp("G#(\\d+)"),
+                t.replace(QRegularExpression("G#(\\d+)"),
                           "<a href='http://gerrit.rockbox.org/r/\\1'>G#\\1</a>");
                 text.append(QString("<li>%1</li>").arg(t));
                 line = c.readLine();
diff --git a/utils/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
index 9bfe7414a3..a0504c0f40 100644
--- a/utils/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -334,7 +334,7 @@ void SelectiveInstallWidget::installBootloader(void)
                         PlayerBuildInfo::DisplayName).toString()
                 + " Firmware Backup";
             // remove invalid character(s)
-            targetFolder.remove(QRegExp("[:/]"));
+            targetFolder.remove(QRegularExpression("[:/]"));
             if(QMessageBox::question(this, tr("Create Bootloader backup"),
                         tr("You can create a backup of the original bootloader "
                             "file. Press \"Yes\" to select an output folder on your "
-- 
cgit v1.2.3