mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 08:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fixes for Qt 6.1

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2024-04-05 13:45:01 +03:00
parent 291efe4b27
commit 8945aed366
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/form/opt/pages/optionspage.cpp
View File

@ -774,7 +774,9 @@ QLayout *OptionsPage::setupEditShortcutLayout()
m_labelShortcut = ControlUtil::createLabel();
m_editShortcut = new QKeySequenceEdit();
#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
m_editShortcut->setClearButtonEnabled(true);
#endif
m_editShortcut->setFixedWidth(200);
const auto onEditShortcut = [&](const QKeySequence &shortcut) {

4
src/ui/manager/envmanager.cpp
View File

@ -38,8 +38,8 @@ bool EnvManager::checkEnvironmentChanged() const
#else
auto it = m_cache.constBegin();
for (; it != m_cache.constEnd(); ++it) {
const auto key = it.key();
const auto value = it.value();
const auto &key = it.key();
const auto &value = it.value();
#endif
const auto newValue = readEnvVar(key);

7
src/ui/util/conf/confutil.cpp
View File

@ -796,7 +796,14 @@ void ConfUtil::writeApps(char **data, const appdata_map_t &appsMap, bool useHead
*offp++ = 0;
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
for (const auto &[kernelPath, appData] : appsMap.asKeyValueRange()) {
#else
auto it = appsMap.constBegin();
for (; it != appsMap.constEnd(); ++it) {
const auto &kernelPath = it.key();
const auto &appData = it.value();
#endif
const int kernelPathSize = kernelPath.size();
const quint16 appPathLen = quint16(kernelPathSize * sizeof(wchar_t));