diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-23 09:27:02 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-23 09:28:07 (GMT) |
| commit | 7d6f139c0bad17c84aa05b84450abb567a5b5458 (patch) | |
| tree | c5147c06833126f79e546b317278296bd3e55951 | |
| parent | 58533cbc7322c4f821f24043028e47925b537419 (diff) | |
| download | Qt-7d6f139c0bad17c84aa05b84450abb567a5b5458.zip Qt-7d6f139c0bad17c84aa05b84450abb567a5b5458.tar.gz Qt-7d6f139c0bad17c84aa05b84450abb567a5b5458.tar.bz2 | |
improve 64 bit support on windows
| -rw-r--r-- | tools/assistant/lib/qhelp_global.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/codemarker.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/assistant/lib/qhelp_global.cpp b/tools/assistant/lib/qhelp_global.cpp index d8a94d3..c2c916b 100644 --- a/tools/assistant/lib/qhelp_global.cpp +++ b/tools/assistant/lib/qhelp_global.cpp @@ -56,7 +56,7 @@ QString QHelpGlobal::uniquifyConnectionName(const QString &name, void *pointer) counter = 0; return QString::fromLatin1("%1-%2-%3"). - arg(name).arg(long(pointer)).arg(counter); + arg(name).arg(quintptr(pointer)).arg(counter); } QString QHelpGlobal::documentTitle(const QString &content) diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp index ee93080..15f2c2d 100644 --- a/tools/qdoc3/codemarker.cpp +++ b/tools/qdoc3/codemarker.cpp @@ -177,7 +177,7 @@ const Node *CodeMarker::nodeForString(const QString& string) QString CodeMarker::stringForNode(const Node *node) { if (sizeof(const Node *) == sizeof(ulong)) { - return QString::number(reinterpret_cast<ulong>(node)); + return QString::number(reinterpret_cast<quintptr>(node)); } else { return QString::number(reinterpret_cast<qulonglong>(node)); |