From 3b5af27889a22ef370b78576d890810ce0544348 Mon Sep 17 00:00:00 2001 From: leha-bot Date: Wed, 24 Jul 2019 13:53:51 +0300 Subject: [PATCH] Fix deprecation warning on Qt 5.12+ See https://doc.qt.io/QT-5/qregularexpression.html#PatternOption-enum about deprecated QRegularExpression enum values. --- Telegram/SourceFiles/base/qthelp_regex.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/base/qthelp_regex.h b/Telegram/SourceFiles/base/qthelp_regex.h index 2bb90f4aa..2e34f9979 100644 --- a/Telegram/SourceFiles/base/qthelp_regex.h +++ b/Telegram/SourceFiles/base/qthelp_regex.h @@ -69,7 +69,10 @@ enum class RegExOption { InvertedGreediness = QRegularExpression::InvertedGreedinessOption, DontCapture = QRegularExpression::DontCaptureOption, UseUnicodeProperties = QRegularExpression::UseUnicodePropertiesOption, -#ifndef OS_MAC_OLD +#if (!defined(OS_MAC_OLD) && ((QT_VERSION < QT_VERSION_CHECK(5, 12, 0)) && (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)))) + /// @note These flags are introduced since Qt 5.4 and become deprecated in Qt 5.12, so we must + /// drop it conditionally. + /// See https://doc.qt.io/QT-5/qregularexpression.html#PatternOption-enum for details. OptimizeOnFirstUsage = QRegularExpression::OptimizeOnFirstUsageOption, DontAutomaticallyOptimize = QRegularExpression::DontAutomaticallyOptimizeOption, #endif // OS_MAC_OLD