From 86bea797dcef69fcc6634ef901ec612eb4c104bd Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Fri, 9 Mar 2018 11:21:27 +0100 Subject: Look for dependency XML files in all prefix paths src/tools/androiddeployqt/main.cpp was moved from qttools into qtbase in 5.11. So re-apply 07bc7c02 in qttools here. Change-Id: I13a77a0c8567d07c4aa6369ed76bdb894b88f86f Reviewed-by: Volker Krause --- src/tools/androiddeployqt/main.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/tools') diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 51c548045c..29681bf5ce 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1426,6 +1426,11 @@ QList findFilesRecursively(const Options &options, const QFileInfo QList findFilesRecursively(const Options &options, const QString &fileName) { + for (const auto &prefix : options.extraPrefixDirs) { + QFileInfo info(prefix + QLatin1Char('/') + fileName); + if (info.exists()) + return findFilesRecursively(options, info, prefix + QLatin1Char('/')); + } QFileInfo info(options.qtInstallDirectory + QLatin1Char('/') + fileName); return findFilesRecursively(options, info, options.qtInstallDirectory + QLatin1Char('/')); } @@ -1435,7 +1440,7 @@ bool readAndroidDependencyXml(Options *options, QSet *usedDependencies, QSet *remainingDependencies) { - QString androidDependencyName = options->qtInstallDirectory + QString::fromLatin1("/lib/%1-android-dependencies.xml").arg(moduleName); + QString androidDependencyName = absoluteFilePath(options, QString::fromLatin1("/lib/%1-android-dependencies.xml").arg(moduleName)); QFile androidDependencyFile(androidDependencyName); if (androidDependencyFile.exists()) { @@ -1480,7 +1485,7 @@ bool readAndroidDependencyXml(Options *options, int bundling = reader.attributes().value(QLatin1String("bundling")).toInt(); QString fileName = reader.attributes().value(QLatin1String("file")).toString(); if (bundling == (options->deploymentMechanism == Options::Bundled)) { - QtDependency dependency(fileName, options->qtInstallDirectory + QLatin1Char('/') + fileName); + QtDependency dependency(fileName, absoluteFilePath(options, fileName)); if (!usedDependencies->contains(dependency.absolutePath)) { options->qtDependencies.append(dependency); usedDependencies->insert(dependency.absolutePath); -- cgit v1.2.3