summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-18 05:15:20 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-18 05:15:20 (GMT)
commit64016d66789950c041bbcc7469aa08653f7fd424 (patch)
tree0dc4caa73f45e9899c4d6f0e9af4d1aa14857073 /src/declarative/qml
parentc5f7b5d382b14ff73fc40044c395148d15844c2f (diff)
downloadQt-64016d66789950c041bbcc7469aa08653f7fd424.zip
Qt-64016d66789950c041bbcc7469aa08653f7fd424.tar.gz
Qt-64016d66789950c041bbcc7469aa08653f7fd424.tar.bz2
String->Int conversion
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qmlbindingvme.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlbindingvme.cpp b/src/declarative/qml/qmlbindingvme.cpp
index 16b0a21..0403e2e 100644
--- a/src/declarative/qml/qmlbindingvme.cpp
+++ b/src/declarative/qml/qmlbindingvme.cpp
@@ -596,7 +596,11 @@ inline static QString toString(Register *reg, int type, bool *ok = 0)
if (type == QMetaType::QReal) {
return QString::number(reg->getqreal());
+ } else if (type == QMetaType::Int) {
+ return QString::number(reg->getint());
} else if (type == qMetaTypeId<QVariant>()) {
+ qWarning() << reg->getvariantptr()->toString() <<
+ *reg->getvariantptr();
return reg->getvariantptr()->toString();
} else if (type == QMetaType::QString) {
return *reg->getstringptr();