From abe3dde5d6af4c1400e19aa3a849812564739c63 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 21 Aug 2019 10:04:14 +0200 Subject: ConsoleProcess: Build against 5.14/MSVC Fix consoleprocess_win.cpp(382): error C2668: 'QListSpecialMethods::join': ambiguous call to overloaded function /src/corelib/text/qstringlist.h(243): note: could be 'QString QListSpecialMethods::join(QChar) const' /src/corelib/text/qstringlist.h(233): note: or 'QString QListSpecialMethods::join(QStringView) const' consoleprocess_win.cpp(382): note: while trying to match the argument list '(char)' Change-Id: Ib1dae4e45c7a9d27f780245ac38952740562b4bf Reviewed-by: Marc Mutz --- src/libs/utils/consoleprocess_win.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp index be65c42cc8d..a4008dfd2e1 100644 --- a/src/libs/utils/consoleprocess_win.cpp +++ b/src/libs/utils/consoleprocess_win.cpp @@ -379,7 +379,8 @@ bool ConsoleProcess::startTerminalEmulator(QSettings *, const QString &workingDi // cmdLine is assumed to be detached - // https://blogs.msdn.microsoft.com/oldnewthing/20090601-00/?p=18083 - QString totalEnvironment = env.toStringList().join('\0') + '\0'; + + QString totalEnvironment = env.toStringList().join(QChar(QChar::Null)) + QChar(QChar::Null); LPVOID envPtr = (env != Utils::Environment::systemEnvironment()) ? (WCHAR *)(totalEnvironment.utf16()) : nullptr; -- cgit v1.2.3