mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-02 08:24:14 +02:00
Merge remote-tracking branch 'upstream/master' into review-635-fix
# Conflicts: # CMakeLists.txt # cmake/developer_options.cmake # cmake/qet_compilation_vars.cmake # sources/qetapp.cpp
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#include <QSettings>
|
||||
#include <QVariant>
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
namespace {
|
||||
const QString SETTINGS_GROUP = QStringLiteral("shortcuts/");
|
||||
@@ -145,7 +146,7 @@ void ShortcutManager::setSequence(const QString &id, const QKeySequence &sequenc
|
||||
settings.setValue(key, sequence.toString());
|
||||
}
|
||||
|
||||
for (const QPointer<QObject> &target : qAsConst(it->targets)) {
|
||||
for (const QPointer<QObject> &target : std::as_const(it->targets)) {
|
||||
if (target) {
|
||||
target->setProperty("shortcut", QVariant::fromValue(sequence));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user