diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:49 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:49 +0200 |
commit | 7a4b7b8cef22ff565583ab36e7ce44029561ffd3 (patch) | |
tree | dc1454b3da4900703e42a775a919254c8008be7e | |
parent | ea1c9924b37b3e619734a5874a714bfb8735d72b (diff) | |
parent | b4c06e0a4dd685eb57e32da52d409bd9417b2122 (diff) | |
download | qttools-7a4b7b8cef22ff565583ab36e7ce44029561ffd3.tar.gz |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I311a5d7b5177dd0cea49ed2d4d9125b27d3ba5e0
-rw-r--r-- | src/androiddeployqt/main.cpp | 3 | ||||
-rw-r--r-- | src/qtdiag/qtdiag.cpp | 8 |
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; |