diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-11-10 18:32:29 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-11-11 09:41:32 (GMT) |
| commit | 772fbf9f5fb7578c5006f4f8a98856b8546f1f71 (patch) | |
| tree | c06dc36d29b84efd27e184559168ad014b2b901c /src/declarative/qml/qdeclarativeobjectscriptclass.cpp | |
| parent | 8a2ae5245787cbfbeaf82c8f296da4d5a404db40 (diff) | |
| download | Qt-772fbf9f5fb7578c5006f4f8a98856b8546f1f71.zip Qt-772fbf9f5fb7578c5006f4f8a98856b8546f1f71.tar.gz Qt-772fbf9f5fb7578c5006f4f8a98856b8546f1f71.tar.bz2 | |
Fix compilation by s/intptr_t/quintptr/
intptr_t is defined in some C header that we don't include. I don't
know which one it is, but without it, it fails to compile with:
declarative/qml/qdeclarativecontext.cpp:477: error: 'intptr_t' was not declared in this scope
Reviewed-By: Trust Me
Diffstat (limited to 'src/declarative/qml/qdeclarativeobjectscriptclass.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeobjectscriptclass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp index ea92111..eff59df 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp +++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp @@ -421,7 +421,7 @@ QScriptValue QDeclarativeObjectScriptClass::tostring(QScriptContext *context, QS ret += QString::fromUtf8(obj->metaObject()->className()); ret += QLatin1String("(0x"); - ret += QString::number((intptr_t)obj,16); + ret += QString::number((quintptr)obj,16); if (!objectName.isEmpty()) { ret += QLatin1String(", \""); |