From 3d8447de5943ee8b5e9973e8b8458cee46e22735 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 14 Oct 2020 20:27:07 +0300 Subject: Android: fix path issue with backslashes on Windows The androiddeployqt tool wasn't handling dependencies with backslashes properly, some dependencies like libplugins_platforms_qtforandroid was written into libs.xml as plugins\platforms\libplugins_platforms_qtforandroid_armeabi, the the app won't be looking for the correct path of the lib to load. Task-number: QTBUG-87574 Change-Id: Iad8c74d30d090adf69a17f2dafb455dff50b3d99 Reviewed-by: Andy Shaw --- src/tools/androiddeployqt/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools') diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index daf3878230..ea278a37a2 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1630,7 +1630,7 @@ bool readAndroidDependencyXml(Options *options, } } else if (reader.name() == QLatin1String("jar")) { int bundling = reader.attributes().value(QLatin1String("bundling")).toInt(); - QString fileName = reader.attributes().value(QLatin1String("file")).toString(); + QString fileName = QDir::cleanPath(reader.attributes().value(QLatin1String("file")).toString()); if (bundling == (options->deploymentMechanism == Options::Bundled)) { QtDependency dependency(fileName, absoluteFilePath(options, fileName)); if (!usedDependencies->contains(dependency.absolutePath)) { @@ -1646,7 +1646,7 @@ bool readAndroidDependencyXml(Options *options, options->initClasses.append(reader.attributes().value(QLatin1String("initClass")).toString()); } } else if (reader.name() == QLatin1String("lib")) { - QString fileName = reader.attributes().value(QLatin1String("file")).toString(); + QString fileName = QDir::cleanPath(reader.attributes().value(QLatin1String("file")).toString()); if (reader.attributes().hasAttribute(QLatin1String("replaces"))) { QString replaces = reader.attributes().value(QLatin1String("replaces")).toString(); for (int i=0; ilocalLibs.size(); ++i) { -- cgit v1.2.3