diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 6372718..05b0c95 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -51,6 +51,8 @@ #include #include #include +#include + #include @@ -641,6 +643,7 @@ static unsigned qtModule(const QString &module) bestMatchLength = libraryName.size(); } } + qDebug() << __FUNCTION__ << module << bestMatch; return bestMatch; } @@ -828,8 +831,11 @@ static DeployResult deploy(const Options &options, qmlScanResult.append(scanResult); // Additional dependencies of QML plugins. foreach (const QString &plugin, qmlScanResult.plugins) { - if (!findDependentQtLibraries(libraryLocation, plugin, options.platform, errorMessage, &dependentQtLibs, &wordSize, &detectedDebug)) + QStringList x; + if (!findDependentQtLibraries(libraryLocation, plugin, options.platform, errorMessage, &x, &wordSize, &detectedDebug)) return result; + dependentQtLibs += x; + qDebug() << __FUNCTION__ << plugin << x; } if (optVerboseLevel >= 1) { std::wcout << "QML imports:\n"; @@ -857,6 +863,7 @@ static DeployResult deploy(const Options &options, else deployedQtLibraries.push_back(dependentQtLibs.at(i)); // Not represented by flag. } + qDebug() << "NR" << deployedQtLibraries; result.deployedQtLibraries = (result.usedQtLibraries | options.additionalLibraries) & ~options.disabledLibraries; // Apply options flags and re-add library names. const size_t qtModulesCount = sizeof(qtModuleEntries)/sizeof(QtModuleEntry); @@ -864,7 +871,7 @@ static DeployResult deploy(const Options &options, if (result.deployedQtLibraries & qtModuleEntries[i].module) deployedQtLibraries.push_back(libraryPath(libraryLocation, qtModuleEntries[i].libraryName, options.platform, isDebug)); - if (optVerboseLevel >= 1) { + if (1) { std::wcout << "Direct dependencies: " << formatQtModules(result.directlyUsedQtLibraries).constData() << "\nAll dependencies : " << formatQtModules(result.usedQtLibraries).constData() << "\nTo be deployed : " << formatQtModules(result.deployedQtLibraries).constData() << '\n';