1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
|
From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Wed, 13 Apr 2016 16:40:35 +0200
Subject: kde4libs_interpret_qvarianttype_as_qmetatypetype
commit b722fc7feb2ef719f221784598b5c586591ca7b6
Author: Maximiliano Curia <maxy@debian.org>
Date: Tue Dec 10 08:47:36 2013 -0300
Interpret QVariant::Tpe as QMetaType::type
---
kdecore/config/kconfiggroup.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdecore/config/kconfiggroup.cpp b/kdecore/config/kconfiggroup.cpp
index e38491766f..981b094463 100644
--- a/kdecore/config/kconfiggroup.cpp
+++ b/kdecore/config/kconfiggroup.cpp
@@ -208,7 +208,7 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray& val
// if a type handler is added here you must add a QVConversions definition
// to conversion_check.h, or ConversionCheck::to_QVariant will not allow
// readEntry<T> to convert to QVariant.
- switch( aDefault.type() ) {
+ switch( static_cast<QMetaType::Type>(aDefault.type()) ) {
case QVariant::Invalid:
return QVariant();
case QVariant::String:
|