Merge master into api_changes

Conflicts:
	src/corelib/kernel/qmetatype.cpp
	src/gui/kernel/qplatformsurface_qpa.cpp
	tests/auto/corelib/tools/qtimeline/qtimeline.pro

Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178

2 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 29b3424315..6462b3df92 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -3918,8 +3918,8 @@ static void invalidateEngine(QRegExpPrivate *priv)
     \value RegExp A rich Perl-like pattern matching syntax. This is
     the default.
 
-    \value RegExp2 Like RegExp, but with \l{greedy quantifiers}. This
-    will be the default in Qt 5. (Introduced in Qt 4.2.)
+    \value RegExp2 Like RegExp, but with \l{greedy quantifiers}.
+    (Introduced in Qt 4.2.)
 
     \value Wildcard This provides a simple pattern matching syntax
     similar to that used by shells (command interpreters) for "file
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index b3d2d62819..6c07480f99 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -108,12 +108,12 @@ static inline uint detectProcessorFeatures()
     uint features = 0;
 
 #if defined(Q_OS_LINUX)
-    int auxv = ::qt_safe_open("/proc/self/auxv", O_RDONLY);
+    int auxv = qt_safe_open("/proc/self/auxv", O_RDONLY);
     if (auxv != -1) {
         unsigned long vector[64];
         int nread;
         while (features == 0) {
-            nread = ::qt_safe_read(auxv, (char *)vector, sizeof vector);
+            nread = qt_safe_read(auxv, (char *)vector, sizeof vector);
             if (nread <= 0) {
                 // EOF or error
                 break;
@@ -130,7 +130,7 @@ static inline uint detectProcessorFeatures()
                 }
         }
 
-        ::qt_safe_close(auxv);
+        qt_safe_close(auxv);
         return features;
     }
     // fall back if /proc/self/auxv wasn't found