Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/assistant/assistant/doc/src/assistant-manual.qdoc

Change-Id: I136caf5f26eff4d1c2574459b8dff9937c2c372d

1 files changed, 1 insertions, 2 deletions

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 51bcb61eb..8a8e59172 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -774,13 +774,12 @@ bool readInputFile(Options *options)
                 if (QFileInfo(path).isDir()) {
                     QDirIterator iterator(path, QDirIterator::Subdirectories);
                     while (iterator.hasNext()) {
+                        iterator.next();
                         if (iterator.fileInfo().isFile()) {
                             QString subPath = iterator.filePath();
                             options->qtDependencies.append(QtDependency(subPath.mid(options->qtInstallDirectory.length() + 1),
                                                                         subPath));
                         }
-
-                        iterator.next();
                     }
                 } else {
                     options->qtDependencies.append(QtDependency(dependency, path));