summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuchen Deng <loaden@gmail.com>2014-04-26 21:48:27 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-28 09:55:33 +0200
commitb4c06e0a4dd685eb57e32da52d409bd9417b2122 (patch)
tree40d2573104d7921f8a2af909163ec915bd5f3923
parentc5ad08d5c898495e491a53c33020bbe74833ee65 (diff)
Android: Fix deploy failed for debug modev5.3.0-rc1
E/dalvikvm(10899): dlopen("/data/local/tmp/qt/lib/libQt5Quick.so") failed: Cannot load library: soinfo_link_image(linker.cpp:1635): could not load library "libQt5Qml.so" needed by "libQt5Quick.so"; caused by load_library(linker.cpp:745): library "libQt5Qml.so" not found Task-number: QTBUG-38606 Change-Id: I8fcb42782a835842a69b0b4d2de4f1ed042555c6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r--src/androiddeployqt/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index de8cf13a8..393e5cbc6 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -1548,6 +1548,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());
@@ -1563,7 +1565,6 @@ bool copyQtFiles(Options *options)
return false;
}
}
- dirIterator.next();
}
foreach (QString qtDependency, options->qtDependencies)