Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid using functions and enum items deprecated in Qt 6

This commit is contained in:
Martchus 2020-09-15 18:10:15 +02:00
parent 15075df0ca
commit 51ca0e895c
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
models/checklistmodel.cpp
View File

@ -81,7 +81,13 @@ bool ChecklistModel::setData(const QModelIndex &index, const QVariant &value, in
success = true;
break;
case Qt::CheckStateRole:
if (value.canConvert(QMetaType::Int)) {
if (value.canConvert(
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QMetaType::Int
#else
QMetaType::fromType<int>()
#endif
)) {
m_items[index.row()].m_checkState = static_cast<Qt::CheckState>(value.toInt());
success = true;
}
@ -224,7 +230,15 @@ void ChecklistModel::restore(QSettings &settings, const QString &name)
continue;
}
const auto selected = settings.value(QStringLiteral("selected"));
if (!id.isNull() && !selected.isNull() && selected.canConvert(QMetaType::Bool) && !restoredIds.contains(id)) {
if (!id.isNull() && !selected.isNull()
&& selected.canConvert(
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QMetaType::Bool
#else
QMetaType::fromType<bool>()
#endif
)
&& !restoredIds.contains(id)) {
m_items << ChecklistItem(id, labelForId(id), selected.toBool() ? Qt::Checked : Qt::Unchecked);
restoredIds << id;
}

2
resources/resources.cpp
View File

@ -306,8 +306,10 @@ bool hasCoreApp()
*/
void setupCommonQtApplicationAttributes()
{
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
#endif
}
// namespace ApplicationInstances