diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-21 10:04:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-21 08:31:15 +0000 |
| commit | abe3dde5d6af4c1400e19aa3a849812564739c63 (patch) | |
| tree | 26a68749f2fa7d2800974341752e394286daaec5 /src | |
| parent | 8b2ac90bb32653c0084364d248dda19d3a7cacfa (diff) | |
ConsoleProcess: Build against 5.14/MSVC
Fix
consoleprocess_win.cpp(382): error C2668: 'QListSpecialMethods<QString>::join': ambiguous call to overloaded function
/src/corelib/text/qstringlist.h(243): note: could be 'QString QListSpecialMethods<QString>::join(QChar) const'
/src/corelib/text/qstringlist.h(233): note: or 'QString QListSpecialMethods<QString>::join(QStringView) const'
consoleprocess_win.cpp(382): note: while trying to match the argument list '(char)'
Change-Id: Ib1dae4e45c7a9d27f780245ac38952740562b4bf
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/utils/consoleprocess_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp index be65c42cc8..a4008dfd2e 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; |