summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-02-11 01:32:03 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-02-11 01:32:03 (GMT)
commit4332bab3a2d478a0827bebdb343cc711aa70c613 (patch)
tree21827cf47146e25735023cefee90180e78976263
parentad169b96c7dc878c556b8b5cc12b9d40233008bf (diff)
downloadQt-4332bab3a2d478a0827bebdb343cc711aa70c613.zip
Qt-4332bab3a2d478a0827bebdb343cc711aa70c613.tar.gz
Qt-4332bab3a2d478a0827bebdb343cc711aa70c613.tar.bz2
QML Object toString should use 64-bit address on 64-bit platforms
-rw-r--r--src/declarative/qml/qmlobjectscriptclass.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 2823496..1c41d46 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -377,7 +377,7 @@ QScriptValue QmlObjectScriptClass::tostring(QScriptContext *context, QScriptEngi
ret += QString::fromUtf8(obj->metaObject()->className());
ret += QLatin1String("(0x");
- ret += QString::number((quintptr)obj,16);
+ ret += QString::number((intptr_t)obj,16);
if (!objectName.isEmpty()) {
ret += QLatin1String(", \"");