diff options
| author | Maximiliano Curia <maxy@debian.org> | 2013-12-10 16:06:17 -0300 |
|---|---|---|
| committer | Maximiliano Curia <maxy@debian.org> | 2013-12-10 16:06:17 -0300 |
| commit | 7768513889491683469afd0594dc58ac60e45fcc (patch) | |
| tree | 8b7eedc6a747ddd175928e3c45976a0da072a52d | |
| parent | a060f1cd831058444bb2a8874c46e9c2b95a50c0 (diff) | |
| download | kde4libs-7768513889491683469afd0594dc58ac60e45fcc.tar.gz | |
New patch: kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b1013f5..e5009ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ kde4libs (4:4.11.4-1~1) UNRELEASED; urgency=low * New upstream release. * Update qt4_designer_plugins_path.diff, install qt4 plugins in ma paths. + * New patch: kde4libs_interpret_qvarianttype_as_qmetatypetype.diff -- Maximiliano Curia <maxy@debian.org> Fri, 06 Dec 2013 16:25:22 +0100 diff --git a/debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff b/debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff new file mode 100644 index 0000000..0eb0fb9 --- /dev/null +++ b/debian/patches/kde4libs_interpret_qvarianttype_as_qmetatypetype.diff @@ -0,0 +1,19 @@ +commit b722fc7feb2ef719f221784598b5c586591ca7b6 +Author: Maximiliano Curia <maxy@debian.org> +Date: Tue Dec 10 08:47:36 2013 -0300 + + Interpret QVariant::Tpe as QMetaType::type + +diff --git a/kdecore/config/kconfiggroup.cpp b/kdecore/config/kconfiggroup.cpp +index a804d37..b1b09e4 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: diff --git a/debian/patches/series b/debian/patches/series index 8c062c2..6518891 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,3 +23,4 @@ glibc_filesystem.diff kfreebsd_getmntent.diff kfreebsd_acl.diff cmake_compatibility.diff +kde4libs_interpret_qvarianttype_as_qmetatypetype.diff |