From e9f54804e13bbe50e1012ac464f0a1ee9d5cd897 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 13 Mar 2020 13:54:31 +0100 Subject: [PATCH 1/2] Doc: Remove mentioning of OpenSSL version The version we ship in 4.11 is 1.1.1d Chances are we will forget updating this version number in the future too, so let's just not mention it. Change-Id: Ibb8248a4eaa38f6dab93af8170f1f77a2dff3c28 Reviewed-by: Eike Ziller --- doc/src/overview/creator-acknowledgements.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc index 1364f75d395..0ed535bb416 100644 --- a/doc/src/overview/creator-acknowledgements.qdoc +++ b/doc/src/overview/creator-acknowledgements.qdoc @@ -381,7 +381,7 @@ Copyright (C) 2010-2015 three.js authors\br 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 License and the original SSLeay license apply to the toolkit. @@ -391,7 +391,7 @@ 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 modification, are permitted provided that the following conditions From b17de35ef416f43ef28506e8d24aaa636848a6b6 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 19 Mar 2020 15:15:01 +0100 Subject: [PATCH 2/2] Debugger: Add separator between cdb extension paths According to https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/ general-environment-variables extension paths have to be separated by a semicolon. Skipping the separator results in not being able to debug with cdb since the debugger cannot find the Qt Creator cdbextension in the now invalid extension path. Change-Id: Ic1c478dbb94f4e774e6742a3800dbcf6452898d5 Reviewed-by: Christian Kandeler Reviewed-by: Eike Ziller --- src/plugins/debugger/cdb/cdbengine.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 798013ed42f..7685dedaf6a 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -441,11 +441,12 @@ void CdbEngine::setupEngine() inferiorEnvironment.set(qtLoggingToConsoleKey, "0"); static const char cdbExtensionPathVariableC[] = "_NT_DEBUGGER_EXTENSION_PATH"; - inferiorEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath()); + inferiorEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath(), {";"}); const QByteArray oldCdbExtensionPath = qgetenv(cdbExtensionPathVariableC); if (!oldCdbExtensionPath.isEmpty()) { inferiorEnvironment.appendOrSet(cdbExtensionPathVariableC, - QString::fromLocal8Bit(oldCdbExtensionPath)); + QString::fromLocal8Bit(oldCdbExtensionPath), + {";"}); } m_process.setEnvironment(inferiorEnvironment);