From 5a6cfafda838bc992733deefbb043b9f87a8553b Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 20 Oct 2023 11:07:33 +0200 Subject: [PATCH] Sketch: fix Qt6 build failure QRegExp has been replaced with QRegularExpression and isn't part of the base of Qt6 any more --- src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp index 17361f0425..1679abb88e 100644 --- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp +++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp @@ -25,6 +25,8 @@ #ifndef _PreComp_ #include +#include +#include #endif #include "ui_SketcherToolDefaultWidget.h" @@ -98,14 +100,13 @@ bool SketcherToolDefaultWidget::KeyboardManager::handleKeyEvent(QKeyEvent* keyEv void SketcherToolDefaultWidget::KeyboardManager::detectKeyboardEventHandlingMode( QKeyEvent* keyEvent) { - Q_UNUSED(keyEvent); - + QRegularExpression rx(QStringLiteral("^[0-9]$")); + auto match = rx.match(keyEvent->text()); if (keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Tab || keyEvent->key() == Qt::Key_Backtab || keyEvent->key() == Qt::Key_Backspace || keyEvent->key() == Qt::Key_Delete || keyEvent->key() == Qt::Key_Minus || keyEvent->key() == Qt::Key_Period - || keyEvent->key() == Qt::Key_Comma - || QRegExp(QStringLiteral("[0-9]")).exactMatch(keyEvent->text())) { + || keyEvent->key() == Qt::Key_Comma || match.hasMatch()) { keyMode = KeyboardEventHandlingMode::Widget; timer.start(timeOut); }