diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-24 17:02:57 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-24 16:58:49 +0000 |
commit | 7af0ea5b0f883415927727c8ed10bb6256d1f12d (patch) | |
tree | 6f9ed3071e38144c4c7b9439c7b55c0fa971ec59 /src/corelib | |
parent | 0de4b76b9c76ddc4d7ee9790b70f39b7ee577ede (diff) |
Disable warnings about deprecated QRegularExpression::PatternOptions
We still want to have these in the debug output for completeness,
so disable the warning instead of removing the lines.
Change-Id: I4291adddff486e4ea963be36ac0ebda089a66045
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/tools/qregularexpression.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp index 6f0e572f41..1026d4ab28 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -2742,10 +2742,13 @@ QDebug operator<<(QDebug debug, QRegularExpression::PatternOptions patternOption flags.append("DontCaptureOption|"); if (patternOptions & QRegularExpression::UseUnicodePropertiesOption) flags.append("UseUnicodePropertiesOption|"); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED if (patternOptions & QRegularExpression::OptimizeOnFirstUsageOption) flags.append("OptimizeOnFirstUsageOption|"); if (patternOptions & QRegularExpression::DontAutomaticallyOptimizeOption) flags.append("DontAutomaticallyOptimizeOption|"); +QT_WARNING_POP flags.chop(1); } |