diff options
| author | Akos PASZTORY <ext-akos.pasztory@nokia.com> | 2009-11-12 13:04:50 +0200 |
|---|---|---|
| committer | Akos PASZTORY <ext-akos.pasztory@nokia.com> | 2009-11-12 13:04:50 +0200 |
| commit | 978a1176f30c1caf06d0b9ba6218c5add1c28b9e (patch) | |
| tree | 0391fbc7a902a8399a0fff0070a6a850b31f1c05 | |
| parent | c1b28981a3ef031f547adffd5148522b7ec009fb (diff) | |
| parent | eef80f0aec644867ab1659ba70ba241dc91b1734 (diff) | |
Merge remote branch 'origin/master' into qjson
| -rwxr-xr-x | libcontextprovider/customer-tests/multiprovider/env.sh | 2 | ||||
| -rw-r--r-- | libcontextsubscriber/customer-tests/env.sh | 2 | ||||
| -rw-r--r-- | libcontextsubscriber/src/contextpropertyinfo.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/libcontextprovider/customer-tests/multiprovider/env.sh b/libcontextprovider/customer-tests/multiprovider/env.sh index 44cecd9c..0d1ce86b 100755 --- a/libcontextprovider/customer-tests/multiprovider/env.sh +++ b/libcontextprovider/customer-tests/multiprovider/env.sh @@ -2,5 +2,5 @@ export PYTHONPATH=$PYTHONPATH:../../../python export CONTEXT_PROVIDERS=. -export LD_LIBRARY_PATH=../../src/.libs:../../../libcontextsubscriber/src/.libs +export LD_LIBRARY_PATH=../../src/.libs:../../../libcontextsubscriber/src/.libs:$LD_LIBRARY_PATH export PATH=../../../python:../../context-provide:../../../libcontextsubscriber/cli:../../../libcontextsubscriber/cls:../client:$PATH diff --git a/libcontextsubscriber/customer-tests/env.sh b/libcontextsubscriber/customer-tests/env.sh index d780b712..5fc7dd0a 100644 --- a/libcontextsubscriber/customer-tests/env.sh +++ b/libcontextsubscriber/customer-tests/env.sh @@ -3,5 +3,5 @@ export PYTHONPATH=$PYTHONPATH:../../../python export CONTEXT_PROVIDERS=. export CONTEXT_CORE_DECLARATIONS=../../../spec/core.context -export LD_LIBRARY_PATH=../../src/.libs:../../../libcontextprovider/src/.libs +export LD_LIBRARY_PATH=../../src/.libs:../../../libcontextprovider/src/.libs:$LD_LIBRARY_PATH export PATH=../../../python:../../../libcontextprovider/context-provide:../../cli:../../cls:$PATH diff --git a/libcontextsubscriber/src/contextpropertyinfo.cpp b/libcontextsubscriber/src/contextpropertyinfo.cpp index e68d7017..9ab9de17 100644 --- a/libcontextsubscriber/src/contextpropertyinfo.cpp +++ b/libcontextsubscriber/src/contextpropertyinfo.cpp @@ -239,6 +239,8 @@ QString ContextPropertyInfo::type() const return "INT"; else if (typeInfoName == "int32") return "INT"; + else if (typeInfoName == "integer") + return "INT"; else if (typeInfoName == "uint32") return "INT"; else if (typeInfoName == "uint64") @@ -247,6 +249,8 @@ QString ContextPropertyInfo::type() const return "TRUTH"; else if (typeInfoName == "string") return "STRING"; + else if (typeInfoName == "double") + return "DOUBLE"; else return ""; } |