feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ConsoleProcess: Build against 5.14/MSVC

Browse Source 
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>
This commit is contained in:
Friedemann Kleint
2019-08-21 10:04:14 +02:00
parent 8b2ac90bb3
commit abe3dde5d6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/consoleprocess_win.cpp
View File

@@ -379,7 +379,8 @@ bool ConsoleProcess::startTerminalEmulator(QSettings *, const QString &workingDi
// cmdLine is assumed to be detached - // cmdLine is assumed to be detached -
// https://blogs.msdn.microsoft.com/oldnewthing/20090601-00/?p=18083 // 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()) LPVOID envPtr = (env != Utils::Environment::systemEnvironment())
? (WCHAR *)(totalEnvironment.utf16()) : nullptr; ? (WCHAR *)(totalEnvironment.utf16()) : nullptr;