return true;
}
-bool goodToCopy(const Options *options, const QString &file);
+bool goodToCopy(const Options *options, const QString &file, QStringList *unmetDependencies);
bool readDependencies(Options *options)
{
QSet<QString>::iterator start = remainingDependencies.begin();
QString fileName = qtDir+*start;
remainingDependencies.erase(start);
- if (goodToCopy(options, fileName)) {
+
+ QStringList unmetDependencies;
+ if (goodToCopy(options, fileName, &unmetDependencies)) {
bool ok = readDependenciesFromElf(options, fileName, &usedDependencies, &remainingDependencies);
if (!ok)
return false;
+ } else if (options->verbose) {
+ fprintf(stdout, "Skipping %s due to unmet dependencies: %s\n",
+ qPrintable(fileName),
+ qPrintable(unmetDependencies.join(QLatin1Char(','))));
}
- else if (options->verbose)
- fprintf(stdout, "Skipping %s due to unmet dependencies\n", qPrintable(fileName));
}
return true;
}
return true;
}
-bool goodToCopy(const Options *options, const QString &file)
+bool goodToCopy(const Options *options, const QString &file, QStringList *unmetDependencies)
{
if (!file.endsWith(QLatin1String(".so")))
return true;
- foreach (const QString &lib, getQtLibsFromElf(*options, file))
- if (!options->qtDependencies.contains(lib))
- return false;
+ bool ret = true;
+ foreach (const QString &lib, getQtLibsFromElf(*options, file)) {
+ if (!options->qtDependencies.contains(lib)) {
+ ret = false;
+ unmetDependencies->append(lib);
+ }
+ }
- return true;
+ return ret;
}
bool deployToLocalTmp(Options *options,
QFileInfo fileInfo(options->qtInstallDirectory + QLatin1Char('/') + qtDependency);
- if (!goodToCopy(options, fileInfo.absoluteFilePath())) {
+ QStringList unmetDependencies;
+ if (!goodToCopy(options, fileInfo.absoluteFilePath(), &unmetDependencies)) {
if (options->verbose)
- fprintf(stdout, " -- Skipping %s. It has unmet dependencies.\n", qPrintable(fileInfo.absoluteFilePath()));
+ fprintf(stdout, " -- Skipping %s. It has unmet dependencies: %s.\n",
+ qPrintable(fileInfo.absoluteFilePath()),
+ qPrintable(unmetDependencies.join(QLatin1Char(','))));
return true;
}
return false;
}
- if (!goodToCopy(options, sourceFileName)) {
- if (options->verbose)
- fprintf(stdout, " -- Skipping %s. It has unmet dependencies.\n", qPrintable(sourceFileName));
+ QStringList unmetDependencies;
+ if (!goodToCopy(options, sourceFileName, &unmetDependencies)) {
+ if (options->verbose) {
+ fprintf(stdout, " -- Skipping %s. It has unmet dependencies: %s.\n",
+ qPrintable(sourceFileName),
+ qPrintable(unmetDependencies.join(QLatin1Char(','))));
+ }
continue;
}