forked from qt-creator/qt-creator
Minor fixes to compile for building with Qt6.2
Change-Id: I15ab9b92d19491bb0aca3d2389a589411e1fec8d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -432,7 +432,7 @@ void PerfSettings::readGlobalSettings()
|
|||||||
settings->beginGroup(QLatin1String(Constants::AnalyzerSettingsGroupId));
|
settings->beginGroup(QLatin1String(Constants::AnalyzerSettingsGroupId));
|
||||||
Store map = defaults;
|
Store map = defaults;
|
||||||
for (Store::ConstIterator it = defaults.constBegin(); it != defaults.constEnd(); ++it)
|
for (Store::ConstIterator it = defaults.constBegin(); it != defaults.constEnd(); ++it)
|
||||||
map.insert(it.key(), settings->value(it.key(), it.value()));
|
map.insert(it.key(), settings->value(stringFromKey(it.key()), it.value()));
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
fromMap(map);
|
fromMap(map);
|
||||||
@@ -445,7 +445,7 @@ void PerfSettings::writeGlobalSettings() const
|
|||||||
Store map;
|
Store map;
|
||||||
toMap(map);
|
toMap(map);
|
||||||
for (Store::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
|
for (Store::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
|
||||||
settings->setValue(it.key(), it.value());
|
settings->setValue(stringFromKey(it.key()), it.value());
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -28,6 +28,7 @@
|
|||||||
#include <coreplugin/actionmanager/command.h>
|
#include <coreplugin/actionmanager/command.h>
|
||||||
#include <coreplugin/icore.h>
|
#include <coreplugin/icore.h>
|
||||||
|
|
||||||
|
#include <QAction>
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user