From 38292de68a707eeaa2e5ece5a16084c00f8e4bef Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Wed, 18 Sep 2019 13:37:20 +0300 Subject: [PATCH 1/4] BareMetal: Fix auto detection of SDCC toolchain on Windows The SDCC toolchain package can be provided as 32-bit or as 64-bit installer. If the SDCC 64-bit package will be installed on the 32-bit Windows, then it will not be found in the system registry, because we use the QSettings::NativeFormat. So, we need to check the data for the 32-bit and 64-bit registry sequentially. Change-Id: I1e7711bdde173eff21a7ba84f221d505a21709ca Reviewed-by: Christian Kandeler --- src/plugins/baremetal/sdcctoolchain.cpp | 48 ++++++++++++++++--------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index b839a68fe8e..a292a575d96 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -395,27 +395,41 @@ QList SdccToolChainFactory::autoDetect(const QList &al if (Utils::HostOsInfo::isWindowsHost()) { -#ifdef Q_OS_WIN64 - static const char kRegistryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\SDCC"; -#else - static const char kRegistryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\SDCC"; -#endif - - QSettings registry(kRegistryNode, QSettings::NativeFormat); - QString compilerPath = registry.value("Default").toString(); - if (!compilerPath.isEmpty()) { + // Tries to detect the candidate from the 32-bit + // or 64-bit system registry format. + auto probeCandidate = [](QSettings::Format format) { + QSettings registry("HKEY_LOCAL_MACHINE\\SOFTWARE\\SDCC", + format); + QString compilerPath = registry.value("Default").toString(); + if (compilerPath.isEmpty()) + return Candidate{}; // Build full compiler path. compilerPath += "\\bin\\sdcc.exe"; const FilePath fn = FilePath::fromString( QFileInfo(compilerPath).absoluteFilePath()); - if (compilerExists(fn)) { - // Build compiler version. - const QString version = QString("%1.%2.%3").arg( - registry.value("VersionMajor").toString(), - registry.value("VersionMinor").toString(), - registry.value("VersionRevision").toString()); - candidates.push_back({fn, version}); - } + if (!compilerExists(fn)) + return Candidate{}; + // Build compiler version. + const QString version = QString("%1.%2.%3").arg( + registry.value("VersionMajor").toString(), + registry.value("VersionMinor").toString(), + registry.value("VersionRevision").toString()); + return Candidate{fn, version}; + }; + + const QSettings::Format allowedFormats[] = { + QSettings::NativeFormat, +#ifdef Q_OS_WIN + QSettings::Registry32Format, + QSettings::Registry64Format +#endif + }; + + for (const QSettings::Format format : allowedFormats) { + const auto candidate = probeCandidate(format); + if (candidate.compilerPath.isEmpty() || candidates.contains(candidate)) + continue; + candidates.push_back(candidate); } } From 716ec39ae09eb8078583025daec2d744bd023698 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 26 Sep 2019 14:37:54 +0200 Subject: [PATCH 2/4] Debugger: Fix automatic raising of Expressions When adding a new expression automatically raise the Expressions widget if it is not shown already. Change-Id: If89e4e4fbf8cbe57e0f08478cd2d3b9f4797f5ad Reviewed-by: hjk --- src/plugins/debugger/debuggerengine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 6b94e5025d1..dc067e65b47 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -2260,8 +2260,8 @@ void DebuggerEngine::openDisassemblerView(const Location &location) void DebuggerEngine::raiseWatchersWindow() { - if (d->m_watchersView) { - if (auto dock = qobject_cast(d->m_watchersView->parentWidget())) { + if (d->m_watchersView && d->m_watchersWindow) { + if (auto dock = qobject_cast(d->m_watchersWindow->parentWidget())) { if (QAction *act = dock->toggleViewAction()) { if (!act->isChecked()) QTimer::singleShot(1, act, [act] { act->trigger(); }); From a0a0ee0b5f50ddbb2502023531614c3549a31ed2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 27 Sep 2019 15:54:11 +0200 Subject: [PATCH 3/4] More change log for 4.10.1 Change-Id: Iae2927d24e021ef8b2e2f4849963fde4c22f55c0 Reviewed-by: Leena Miettinen --- dist/changes-4.10.1.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.10.1.md b/dist/changes-4.10.1.md index 6e5d0db956d..7d942ba68ab 100644 --- a/dist/changes-4.10.1.md +++ b/dist/changes-4.10.1.md @@ -19,9 +19,13 @@ you can check out from the public Git repository. For example: * Fixed that text moved around when resizing and zooming (QTCREATORBUG-4756) +## All Projects + +* Fixed `Qt Creator Plugin` wizard (QTCREATORBUG-22945) + ## Debugging -* Fixed more layout restoration issues (QTCREATORBUG-22286, QTCREATORBUG-22938) +* Fixed more layout restoration issues (QTCREATORBUG-22286, QTCREATORBUG-22415, QTCREATORBUG-22938) ### LLDB @@ -36,7 +40,13 @@ you can check out from the public Git repository. For example: ### macOS +* Fixed debugging with Xcode 11 (QTCREATORBUG-22955) * Fixed window stacking order after closing file dialog (QTCREATORBUG-22906) +* Fixed window size after exiting fullscreen + +### QNX + +* Fixed that QNX compiler could not be selected for C ## Credits for these changes go to: @@ -44,7 +54,9 @@ Aleksei German Alexander Akulich Andre Hartmann André Pönitz +Christian Kandeler Christian Stenger +Cristian Adam David Schulz Eike Ziller Knud Dollereder @@ -53,5 +65,5 @@ Lisandro Damián Nicanor Pérez Meyer Nikolai Kosjar Orgad Shaneh Richard Weickelt +Sergey Belyashov Thomas Hartmann - From 24dd7be6dbc150131db62921e2b5b922e136b8aa Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 30 Sep 2019 08:44:12 +0200 Subject: [PATCH 4/4] Update qbs submodule To HEAD of 1.14 branch. Change-Id: I16a799316afe1d1be3410ef3084c0724de931c42 Reviewed-by: Eike Ziller --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 94fe404a5a6..aec975a3f95 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 94fe404a5a6d7cf91926bcfbd026953994b25815 +Subproject commit aec975a3f95f905b2d63ea1500ace28eddea7b9e