Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	mkspecs/features/mac/default_post.prf
	mkspecs/features/uikit/default_post.prf

Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp
index 4f4f543ba8..e61473cb7b 100644
--- a/src/gui/opengl/qopengl.cpp
+++ b/src/gui/opengl/qopengl.cpp
@@ -136,9 +136,6 @@ QDebug operator<<(QDebug d, const QOpenGLConfig::Gpu &g)
     return d;
 }
 
-enum Operator { NotEqual, LessThan, LessEqualThan, Equals, GreaterThan, GreaterEqualThan };
-static const char operators[][3] = {"!=", "<", "<=", "=", ">", ">="};
-
 typedef QJsonArray::ConstIterator JsonArrayConstIt;
 
 static inline bool contains(const QJsonArray &haystack, unsigned needle)
@@ -160,6 +157,9 @@ static inline bool contains(const QJsonArray &haystack, const QString &needle)
 }
 
 namespace {
+enum Operator { NotEqual, LessThan, LessEqualThan, Equals, GreaterThan, GreaterEqualThan };
+static const char operators[][3] = {"!=", "<", "<=", "=", ">", ">="};
+
 // VersionTerm describing a version term consisting of number and operator
 // found in os.version and driver_version.
 struct VersionTerm {