1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windeployqt: Multiple directory use warning

Browse Source 
Added a warning for when windeployqt is used with multiple binaries
which are in different directories.

Change-Id: Ic43aa9847eb2bf6927cebf5d457595eed6b16b5a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit a67607480d7cddf604d885532c4359b8c041fd11)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Timothée Keller 2022-12-13 12:39:47 +01:00 committed by Qt Cherry-pick Bot
parent 1cf359def7
commit 4897ea9c6b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/windeployqt/main.cpp
View File

@ -678,6 +678,7 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
} // directory. } // directory.
// Remaining files or plugin directories // Remaining files or plugin directories
bool multipleDirs = false;
for (int i = 1; i < posArgs.size(); ++i) { for (int i = 1; i < posArgs.size(); ++i) {
const QFileInfo fi(QDir::cleanPath(posArgs.at(i))); const QFileInfo fi(QDir::cleanPath(posArgs.at(i)));
const QString path = fi.absoluteFilePath(); const QString path = fi.absoluteFilePath();
@ -691,9 +692,13 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
for (const QString &library : libraries) for (const QString &library : libraries)
options->binaries.append(path + u'/' + library); options->binaries.append(path + u'/' + library);
} else { } else {
if (fi.absolutePath() != options->directory)
multipleDirs = true;
options->binaries.append(path); options->binaries.append(path);
} }
} }
if (multipleDirs)
std::wcerr << "Warning: using binaries from different directories\n";
options->translationsDirectory = options->directory + "/translations"_L1; options->translationsDirectory = options->directory + "/translations"_L1;
return 0; return 0;
} }