Merge remote-tracking branch 'origin/4.14'

Conflicts:
	src/plugins/designer/cpp/formclasswizard.h
	src/plugins/designer/cpp/formclasswizarddialog.h

Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1
This commit is contained in:
Eike Ziller
2020-11-25 11:25:34 +01:00
169 changed files with 1147 additions and 865 deletions

View File

@@ -824,6 +824,7 @@ void MemcheckToolPrivate::heobAction()
if (!commandLineArguments.isEmpty())
arguments += ' ' + commandLineArguments;
QByteArray argumentsCopy(reinterpret_cast<const char *>(arguments.utf16()), arguments.size() * 2 + 2);
Q_UNUSED(argumentsCopy)
// process environment
QByteArray env;