diff options
author | Timothée Keller <timothee.keller@qt.io> | 2022-12-13 12:39:47 +0100 |
---|---|---|
committer | Timothée Keller <timothee.keller@qt.io> | 2023-01-11 16:07:46 +0100 |
commit | a67607480d7cddf604d885532c4359b8c041fd11 (patch) | |
tree | 79f0d162316274413470c32d16f648489a3b6511 /src/tools/windeployqt/main.cpp | |
parent | 0d7401d51bedecb1b84b78aedb50839928a0cc7b (diff) |
Windeployqt: Multiple directory use warning
Added a warning for when windeployqt is used with multiple binaries
which are in different directories.
Pick-to: 6.5
Change-Id: Ic43aa9847eb2bf6927cebf5d457595eed6b16b5a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/tools/windeployqt/main.cpp')
-rw-r--r-- | src/tools/windeployqt/main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index c038a9679f..8a4263b6d0 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -677,6 +677,7 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse } // directory. // Remaining files or plugin directories + bool multipleDirs = false; for (int i = 1; i < posArgs.size(); ++i) { const QFileInfo fi(QDir::cleanPath(posArgs.at(i))); const QString path = fi.absoluteFilePath(); @@ -690,9 +691,13 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse for (const QString &library : libraries) options->binaries.append(path + u'/' + library); } else { + if (fi.absolutePath() != options->directory) + multipleDirs = true; options->binaries.append(path); } } + if (multipleDirs) + std::wcerr << "Warning: using binaries from different directories\n"; options->translationsDirectory = options->directory + "/translations"_L1; return 0; } |