Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I892bbc73c276842894a720f761ce31ad1b015672

1 files changed, 6 insertions, 0 deletions

diff --git a/src/3rdparty/v8/src/scanner.cc b/src/3rdparty/v8/src/scanner.cc
index f24af2e..61ee1a4 100755
--- a/src/3rdparty/v8/src/scanner.cc
+++ b/src/3rdparty/v8/src/scanner.cc
@@ -32,6 +32,11 @@
 #include "../include/v8stdint.h"
 #include "char-predicates-inl.h"
 
+#undef CONST
+#undef DELETE
+#undef IN
+#undef VOID
+
 namespace v8 {
 namespace internal {
 
@@ -1077,6 +1082,7 @@ bool Scanner::ScanRegExpFlags() {
       if (!ScanLiteralUnicodeEscape()) {
         break;
       }
+      Advance();
     }
   }
   literal.Complete();