From 5fea58348140ff194ea2fea501e1fbef028d12d7 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Thu, 25 Jul 2019 13:57:43 +0200
Subject: [PATCH] Utils: Avoid compile issue with upcoming Qt

QStringList::join() can be ambigous when it gets passed
a '\0'. Avoid this ambiguity by explicitly casting its
parameter.

Change-Id: I65b33d7d59da90d78bfb86d146093338b31e7fd0
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/consoleprocess.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
index 9477361abde..20aa3351edf 100644
--- a/src/libs/utils/consoleprocess.cpp
+++ b/src/libs/utils/consoleprocess.cpp
@@ -329,7 +329,7 @@ bool ConsoleProcess::startTerminalEmulator(QSettings *settings, const QString &w
     // 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('\0')) + '\0';
     LPVOID envPtr = (env != Environment::systemEnvironment())
             ? (WCHAR *)(totalEnvironment.utf16()) : nullptr;