Gui: Qt6 port

* QString::indexOf() is now marked as [[nodiscard]]
* Replace deprecated methods of QMessageBox
* QMouseEvent::globalPos() is deprecated, use globalPosition().toPoint()
* QWidget::enterEvent() requires a QEnterEvent as argument
* QLibraryInfo::location() is deprecated, use path()
* QVariant::Type is deprecated, use QMetaType::Type
* QVariant::canConvert(int) is deprecated, use QVariant::canConvert(QMetaType) or QVariant::canConvert<T>()
* QMessageBox::standardIcon is deprecated, use QStyle::standardIcon()
* Replace deprecated method QMessageBox::question(), ...
* QApplication::fontMetrics() is deprecated
* QDropEvent::mouseButtons() is deprecated, use buttons()
* QDropEvent::keyboardModifiers() is deprecated, use modifiers()
* Constructor of QFontDatabase is deprecated, use static methods instead
* Qt::AA_DisableHighDpiScaling is deprecated
* Qt::AA_EnableHighDpiScaling is deprecated
* Qt::AA_UseHighDpiPixmaps is deprecated
This commit is contained in:
wmayer
2022-11-05 15:08:58 +01:00
parent 588620fd9f
commit 81d2361d9f
19 changed files with 123 additions and 49 deletions

View File

@@ -562,9 +562,9 @@ Py::Object PyResource::value(const Py::Tuple& args)
}
Py::Object item = Py::None();
switch (v.type())
switch (v.userType())
{
case QVariant::StringList:
case QMetaType::QStringList:
{
QStringList str = v.toStringList();
int nSize = str.count();
@@ -574,21 +574,21 @@ Py::Object PyResource::value(const Py::Tuple& args)
}
item = slist;
} break;
case QVariant::ByteArray:
case QMetaType::QByteArray:
break;
case QVariant::String:
case QMetaType::QString:
item = Py::String(v.toString().toLatin1());
break;
case QVariant::Double:
case QMetaType::Double:
item = Py::Float(v.toDouble());
break;
case QVariant::Bool:
case QMetaType::Bool:
item = Py::Boolean(v.toBool() ? 1 : 0);
break;
case QVariant::UInt:
case QMetaType::UInt:
item = Py::Long(static_cast<unsigned long>(v.toUInt()));
break;
case QVariant::Int:
case QMetaType::Int:
item = Py::Int(v.toInt());
break;
default: