From 5b300a152699fa1ae833eb38066f3cbd60b61142 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Tue, 29 Apr 2014 20:45:45 +0200
Subject: QRegularExpression: add an option to prevent automatic optimization

If a user doesn't like that QRegularExpression might do an
uncontrolled CPU/memory spike when it decides to optimize a pattern,
offer a way to disable the automatic optimization.

Change-Id: I38a98a3bfb239cfad9f977b0eeb75903268e747f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qregularexpression.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/corelib/tools/qregularexpression.h')

diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/tools/qregularexpression.h
index 6154ea7c51..bf75d12a05 100644
--- a/src/corelib/tools/qregularexpression.h
+++ b/src/corelib/tools/qregularexpression.h
@@ -70,7 +70,8 @@ public:
         InvertedGreedinessOption       = 0x0010,
         DontCaptureOption              = 0x0020,
         UseUnicodePropertiesOption     = 0x0040,
-        OptimizeOnFirstUsageOption     = 0x0080
+        OptimizeOnFirstUsageOption     = 0x0080,
+        DontAutomaticallyOptimizeOption = 0x0100
     };
     Q_DECLARE_FLAGS(PatternOptions, PatternOption)
 
-- 
cgit v1.2.3