From f5bcfb8f57f6588b8264667e57bff79241c29369 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 9 Jul 2021 11:50:04 +0200 Subject: Fix C++20 compilation of androiddeployqt 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 857be50b2e193b92de37c3e2bb5124d24d21a253. Pick-to: 6.2 Change-Id: I7f194befc08ab50cdef321d8900ee3553599a19e Reviewed-by: Andreas Buhr --- src/tools/androiddeployqt/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools') diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index fcfb6d36f5..0bd9f4e16e 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -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; } -- cgit v1.2.3