AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix C++20 compilation of androiddeployqt

Browse Source 
u8 literals changed type from const char[] to const char8_t[] in C++20
and Qt APIs that don't use QUtf8StringView aren't prepared for it. Use
a classical char literal for the time being.

Amends 857be50b2e.

Pick-to: 6.2
Change-Id: I7f194befc08ab50cdef321d8900ee3553599a19e
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
This commit is contained in:
Marc Mutz 2021-07-09 11:50:04 +02:00
parent 74d6c36eb7
commit f5bcfb8f57
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/androiddeployqt/main.cpp
View File

@ -2987,14 +2987,14 @@ bool writeDependencyFile(const Options &options)
if (depFile.open(QIODevice::WriteOnly)) {
depFile.write(escapeAndEncodeDependencyPath(relativeApkPath));
depFile.write(u8": ");
depFile.write(": ");
for (const auto &file : dependenciesForDepfile) {
depFile.write(u8" \\\n ");
depFile.write(" \\\n ");
depFile.write(escapeAndEncodeDependencyPath(file));
}
depFile.write(u8"\n");
depFile.write("\n");
}
return true;
}