diff --git a/src/plasma/containmentactions.cpp b/src/plasma/containmentactions.cpp --- a/src/plasma/containmentactions.cpp +++ b/src/plasma/containmentactions.cpp @@ -133,10 +133,10 @@ } case QEvent::Wheel: { QWheelEvent *e = static_cast(event); - int o = QObject::staticQtMetaObject.indexOfEnumerator("Orientations"); - QMetaEnum orient = QObject::staticQtMetaObject.enumerator(o); trigger = QStringLiteral("wheel:"); #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + const int o = QObject::staticQtMetaObject.indexOfEnumerator("Orientations"); + QMetaEnum orient = QObject::staticQtMetaObject.enumerator(o); trigger += QString::fromLatin1(orient.valueToKey(e->orientation())); #else // ContainmentInterface::wheelEvent uses angleDelta.y() diff --git a/src/plasma/private/storagethread.cpp b/src/plasma/private/storagethread.cpp --- a/src/plasma/private/storagethread.cpp +++ b/src/plasma/private/storagethread.cpp @@ -161,15 +161,14 @@ QString field; bool binary = false; - switch (QMetaType::Type(it.value().type())) { + switch (it.value().type()) { case QVariant::String: field = QStringLiteral(":txt"); break; case QVariant::Int: field = QStringLiteral(":int"); break; case QVariant::Double: - case QMetaType::Float: field = QStringLiteral(":float"); break; case QVariant::ByteArray: diff --git a/src/scriptengines/qml/plasmoid/dropmenu.h b/src/scriptengines/qml/plasmoid/dropmenu.h --- a/src/scriptengines/qml/plasmoid/dropmenu.h +++ b/src/scriptengines/qml/plasmoid/dropmenu.h @@ -56,7 +56,6 @@ private: QPoint m_dropPoint; QMenu *m_menu = nullptr; - QJSValue *m_dropCallback = nullptr; KIO::DropJob *m_dropJob = nullptr; QList m_dropActions = QList(); QList m_urls = QList();