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

Merge remote-tracking branch 'origin/4.11' into 4.12

Browse Source 
Change-Id: I125d2e574cbee28d69c8181909f2db57e897f0a4
This commit is contained in:
Eike Ziller
2020-03-20 08:00:06 +01:00
parent 098ee51a9b b17de35ef4
commit 7f0b418a22
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/qtcreator/src/overview/creator-acknowledgements.qdoc
View File

@@ -381,7 +381,7 @@
Copyright (C) 2010-2015 three.js authors\br Copyright (C) 2010-2015 three.js authors\br
share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication
\li \b{OpenSSL toolkit. Version 1.0.2j} \li \b{OpenSSL toolkit}
The OpenSSL toolkit stays under a double license, i.e. both the conditions of The OpenSSL toolkit stays under a double license, i.e. both the conditions of
the OpenSSL License and the original SSLeay license apply to the toolkit. the OpenSSL License and the original SSLeay license apply to the toolkit.
@@ -391,7 +391,7 @@
OpenSSL License OpenSSL License
==================================================================== ====================================================================
Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved. Copyright (c) 1998-2019 The OpenSSL Project. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions

5
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -440,11 +440,12 @@ void CdbEngine::setupEngine()
inferiorEnvironment.set(qtLoggingToConsoleKey, "0"); inferiorEnvironment.set(qtLoggingToConsoleKey, "0");
static const char cdbExtensionPathVariableC[] = "_NT_DEBUGGER_EXTENSION_PATH"; static const char cdbExtensionPathVariableC[] = "_NT_DEBUGGER_EXTENSION_PATH";
inferiorEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath()); inferiorEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath(), {";"});
const QByteArray oldCdbExtensionPath = qgetenv(cdbExtensionPathVariableC); const QByteArray oldCdbExtensionPath = qgetenv(cdbExtensionPathVariableC);
if (!oldCdbExtensionPath.isEmpty()) { if (!oldCdbExtensionPath.isEmpty()) {
inferiorEnvironment.appendOrSet(cdbExtensionPathVariableC, inferiorEnvironment.appendOrSet(cdbExtensionPathVariableC,
QString::fromLocal8Bit(oldCdbExtensionPath)); QString::fromLocal8Bit(oldCdbExtensionPath),
{";"});
} }
m_process.setEnvironment(inferiorEnvironment); m_process.setEnvironment(inferiorEnvironment);