From b798b2cbb4061243762531c7eef37de165ced949 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Sun, 15 Mar 2020 14:47:00 +0100
Subject: Remove QRegExp usage from Qt PrintSupport

Change-Id: I32daae8e5028084dd12f0aba4da7920f995d919f
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
---
 src/printsupport/dialogs/qprintdialog_unix.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/printsupport/dialogs/qprintdialog_unix.cpp')

diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index f3b47bcbd2..a59d8bbb4a 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -67,6 +67,10 @@
 
 #include <QtWidgets/qdialogbuttonbox.h>
 
+#if QT_CONFIG(regularexpression)
+#include <qregularexpression.h>
+#endif
+
 #if QT_CONFIG(completer)
 #include <private/qcompleter_p.h>
 #endif
@@ -1434,10 +1438,13 @@ QUnixPrintWidget::QUnixPrintWidget(QPrinter *printer, QWidget *parent)
             if (printer->docName().isEmpty()) {
                 cur += QStringLiteral("print.pdf");
             } else {
-                const QRegExp re(QStringLiteral("(.*)\\.\\S+"));
-                if (re.exactMatch(printer->docName()))
-                    cur += re.cap(1);
+#if QT_CONFIG(regularexpression)
+                const QRegularExpression re(QStringLiteral("(.*)\\.\\S+"));
+                auto match = re.match(printer->docName());
+                if (match.hasMatch())
+                    cur += match.captured(1);
                 else
+#endif
                     cur += printer->docName();
                 cur += QStringLiteral(".pdf");
             }
-- 
cgit v1.2.3