diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | libcontextsubscriber/src/infocdbbackend.cpp | 2 | ||||
-rw-r--r-- | libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 710c3010..99c3aeb8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) -AC_INIT([ContextKit], [0.3.5~unreleased], [marius.vollmer@nokia.com], ContextKit) +AC_INIT([ContextKit], [0.3.5], [marius.vollmer@nokia.com], ContextKit) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 tar-ustar 1.9]) diff --git a/debian/changelog b/debian/changelog index 24499449..a7d21087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -contextkit (0.3.5~unreleased) unstable; urgency=low +contextkit (0.3.5) unstable; urgency=low - * + * Internal change: in the cdb we store serialized QVariants from now on. - -- Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> Fri, 18 Sep 2009 16:17:07 +0300 + Imlemented: CntFr-305 + + -- Gergely Risko <gergely+context@risko.hu> Mon, 21 Sep 2009 16:27:40 +0300 contextkit (0.3.4) unstable; urgency=low diff --git a/libcontextsubscriber/src/infocdbbackend.cpp b/libcontextsubscriber/src/infocdbbackend.cpp index 217f11c5..87025d6f 100644 --- a/libcontextsubscriber/src/infocdbbackend.cpp +++ b/libcontextsubscriber/src/infocdbbackend.cpp @@ -114,7 +114,7 @@ bool InfoCdbBackend::keyExists(QString key) const bool InfoCdbBackend::keyProvided(QString key) const { - QString plugin = reader.valueForKey(key + ":KEYPLUGIN"); + QString plugin = reader.valueForKey(key + ":KEYPLUGIN").toString(); if (plugin == "") return false; diff --git a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am index 9d25f258..1bc9da49 100644 --- a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am +++ b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am @@ -6,6 +6,7 @@ contextregistryinfounittest_cdb_static_SOURCES = contextregistryinfounittest.cpp COVERAGE_FILES = contextregistryinfo.cpp \ infobackend.cpp \ infocdbbackend.cpp +EXTRA_DIST = cache.cdb # do the testing, coverage, etc. stuff # tests.am is using +=, so we have to set a value here for these four always |