Merge remote-tracking branch 'origin/release' into stable

Change-Id: I311a5d7b5177dd0cea49ed2d4d9125b27d3ba5e0

2 files changed, 6 insertions, 5 deletions

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 02eb063bb..385d9ce89 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -1620,6 +1620,8 @@ bool copyQtFiles(Options *options)
         // For debug deployment, we copy all libraries and plugins
         QDirIterator dirIterator(options->qtInstallDirectory, QDirIterator::Subdirectories);
         while (dirIterator.hasNext()) {
+            dirIterator.next();
+
             QFileInfo info = dirIterator.fileInfo();
             if (!info.isDir()) {
                 QString relativePath = info.absoluteFilePath().mid(options->qtInstallDirectory.length());
@@ -1635,7 +1637,6 @@ bool copyQtFiles(Options *options)
                         return false;
                 }
             }
-            dirIterator.next();
         }
 
         foreach (QString qtDependency, options->qtDependencies)
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index acf4bce84..558bf4bd2 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -139,11 +139,11 @@ void dumpGlInfo(QTextStream &str, bool listExtensions)
         str << "Dynamic GL ";
 #  endif
         switch (context.openGLModuleType()) {
-        case QOpenGLContext::DesktopGL:
-            str << "DesktopGL";
+        case QOpenGLContext::LibGL:
+            str << "LibGL";
             break;
-        case QOpenGLContext::GLES2:
-            str << "GLES2";
+        case QOpenGLContext::LibGLES:
+            str << "LibGLES";
             break;
         }
         QWindow window;