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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I19a7406f7e387b53f1e7b3f08a0b4c89a377ab82
This commit is contained in:
Eike Ziller
2020-06-08 08:22:10 +02:00
parent d62acfdefa 63bb91f0b7
commit 623e607b23
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -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)

7
tests/auto/debugger/tst_offsets.cpp
View File

@@ -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