diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-11-08 04:12:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-11-08 04:12:57 (GMT) |
| commit | 16316f170fde30b91ed884a95d5910bd4de63782 (patch) | |
| tree | a604f53d2d97fe6e39695b0dcca42929231c0eef /src/declarative/qml/qdeclarativeprivate.h | |
| parent | 2875e6b26c9a40ad1f5e4e214937e5a19a56432c (diff) | |
| download | Qt-16316f170fde30b91ed884a95d5910bd4de63782.zip Qt-16316f170fde30b91ed884a95d5910bd4de63782.tar.gz Qt-16316f170fde30b91ed884a95d5910bd4de63782.tar.bz2 | |
Don't use stdint.h in our headers since it is a C99 header.
This caused problems in user applications depending upon the order of
inlcusion and/or defining __STDC_LIMIT_MACROS. stdint.h is also
not present in msvc, but is present in mingw. Switch to using
quintptr.
Task-number: QTBUG-14691
Task-number: QTBUG-13953
Reviewed-by: Bea Lam
Diffstat (limited to 'src/declarative/qml/qdeclarativeprivate.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeprivate.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index d45ddbc..388c92e 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -55,9 +55,6 @@ #include <QtCore/qglobal.h> #include <QtCore/qvariant.h> -#ifndef Q_OS_WIN -#include <stdint.h> -#endif QT_BEGIN_HEADER @@ -105,7 +102,7 @@ namespace QDeclarativePrivate template<class From, class To> struct StaticCastSelectorClass<From, To, sizeof(int)> { - static inline int cast() { return int(reinterpret_cast<intptr_t>(static_cast<To *>(reinterpret_cast<From *>(0x10000000)))) - 0x10000000; } + static inline int cast() { return int(reinterpret_cast<quintptr>(static_cast<To *>(reinterpret_cast<From *>(0x10000000)))) - 0x10000000; } }; template<class From, class To> |