From 777ae8b87b94b41e8af35ea786804bfc51e6c184 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 3 Jun 2020 14:10:47 +0200 Subject: [PATCH 1/3] Debugger: Adapt offset tests to changed QDateTime structure layout Chandge with 5f1f0fe0b71c in qtbase. Change-Id: Ifceac5125f974a1ebd2ab2e358ba906188d451a2 Reviewed-by: Christian Kandeler --- tests/auto/debugger/tst_offsets.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index 90d1cfa3ef8..5fa28d98973 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -272,11 +272,16 @@ void tst_offsets::offsets_data() OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24; OFFSET_TEST(QDateTimePrivate, m_status) << 24 << 32; # endif -#else +#elif QT_VERSION < 0x50e00 OFFSET_TEST(QDateTimePrivate, m_msecs) << 0 << 0; OFFSET_TEST(QDateTimePrivate, m_status) << 8 << 8; OFFSET_TEST(QDateTimePrivate, m_offsetFromUtc) << 12 << 12; OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24; +#else + OFFSET_TEST(QDateTimePrivate, m_msecs) << 8 << 8; + OFFSET_TEST(QDateTimePrivate, m_status) << 4 << 4; + OFFSET_TEST(QDateTimePrivate, m_offsetFromUtc) << 16 << 16; + OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24; #endif #ifdef HAS_BOOST From 81e0d9da11fde5e0bab012b53a1890b9bd34b4e8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 3 Jun 2020 09:28:47 +0200 Subject: [PATCH 2/3] McuSupport: Fix a bug in the writing of settings The plugin wants to only store settings if they differ from the defaults (e.g. a path was edited by the user). The original attempt failed. If the user changed the path, stored it, and then changed the path back to the default, the last change was not stored. Therefore, this change actually removes the settings entry if it equals either the default or the install settings value. Task-number: QTCREATORBUG-24048 Change-Id: I6ab11f276ae270bb8bbf50ad6d2bc7ea3dba2d7b Reviewed-by: Eike Ziller --- src/plugins/mcusupport/mcusupportoptions.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index bb10f7b0648..96457170fa2 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -167,12 +167,16 @@ bool McuPackage::addToPath() const void McuPackage::writeToSettings() const { - if (m_path.compare(m_defaultPath) == 0) - return; - QSettings *s = Core::ICore::settings(); - s->beginGroup(Constants::SETTINGS_GROUP); - s->setValue(QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey, m_path); - s->endGroup(); + const QString key = QLatin1String(Constants::SETTINGS_GROUP) + '/' + + QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey; + const QSettings *iS = Core::ICore::settings(QSettings::SystemScope); + QSettings *uS = Core::ICore::settings(); + if (m_path == m_defaultPath || ( + iS->contains(key) && + m_path == Utils::FilePath::fromUserInput(iS->value(key).toString()).toString())) + uS->remove(key); + else + uS->setValue(key, m_path); } void McuPackage::setRelativePathModifier(const QString &path) From 63bb91f0b78f7ab2f969dee1ad488f2c1f9058f5 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 5 Jun 2020 08:32:05 +0200 Subject: [PATCH 3/3] Bump version -> 4.12.3 Change-Id: Ie308ec72c587e7a30b8e7664a90211a9191fa3f0 Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 4 ++-- qbs/modules/qtc/qtc.qbs | 4 ++-- qtcreator_ide_branding.pri | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index ca406149df9..c00fc47db20 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,9 +1,9 @@ #BINARY_ARTIFACTS_BRANCH = master #PROJECT_USER_FILE_EXTENSION = .user -set(IDE_VERSION "4.12.2") # The IDE version. +set(IDE_VERSION "4.12.3") # The IDE version. set(IDE_VERSION_COMPAT "4.12.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.12.2") # The IDE display version. +set(IDE_VERSION_DISPLAY "4.12.3") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 93d08ab97f8..cd192640930 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.12.2' + property string qtcreator_display_version: '4.12.3' property string ide_version_major: '4' property string ide_version_minor: '12' - property string ide_version_release: '2' + property string ide_version_release: '3' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index baed3a66266..1825278315c 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.12.2 +QTCREATOR_VERSION = 4.12.3 QTCREATOR_COMPAT_VERSION = 4.12.0 -QTCREATOR_DISPLAY_VERSION = 4.12.2 +QTCREATOR_DISPLAY_VERSION = 4.12.3 QTCREATOR_COPYRIGHT_YEAR = 2020 BINARY_ARTIFACTS_BRANCH = 4.12