diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-20 13:38:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 04:24:00 +0200 |
| commit | e04cadca4a6c0b43d29c83d23ac74393694a5ea5 (patch) | |
| tree | aa495250e8fa420b6b262c76b1d5ad2050067cb9 /src/qml/qml/ftw/qhashedstring_p.h | |
| parent | ff959399c9bd13e4c881cd6aa7f953dce92bda5b (diff) | |
Fix compilation with MSVC 2008 (and prospective Windows CE build fix)
* Only 2010 and newer ship stdint.h, so for 2008 we have to provide a little
stdint.h compat header, for some of the third-party code we import. Our own
Qt code this patch changes to use quint* types instead.
* Include math.h and float.h for some math functions.
* disable the JIT on Windows CE for now.
* Change use of intptr_t to qintptr in Qt code. intptr_t is in inttypes.h,
except that with VS 2008 it is indirectly available through stdio.h. Let's
avoid the mess and just use the qt type, that's always available.
Change-Id: I19055edd89e0a6b147d9edbb3b711798ed3c05a5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/ftw/qhashedstring_p.h')
| -rw-r--r-- | src/qml/qml/ftw/qhashedstring_p.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h index 4815f787b6..9b7215f0ae 100644 --- a/src/qml/qml/ftw/qhashedstring_p.h +++ b/src/qml/qml/ftw/qhashedstring_p.h @@ -64,8 +64,6 @@ #include <stdlib.h> #endif -#include <stdint.h> - QT_BEGIN_NAMESPACE // Enable this to debug hash linking assumptions. @@ -164,7 +162,7 @@ public: QString toUtf16() const; inline int utf16length() const; inline void writeUtf16(QChar *) const; - inline void writeUtf16(uint16_t *) const; + inline void writeUtf16(quint16 *) const; private: friend class QHashedStringRef; @@ -232,7 +230,7 @@ public: void setQString(bool v) { if (v) next.setFlag(); else next.clearFlag(); } inline char *cStrData() const { return (char *)ckey; } - inline uint16_t *utf16Data() const { return (uint16_t *)strData->data(); } + inline quint16 *utf16Data() const { return (quint16 *)strData->data(); } inline bool equals(const QV4::Value &string) const { QString s = string.toQString(); @@ -1274,10 +1272,10 @@ int QHashedCStringRef::utf16length() const void QHashedCStringRef::writeUtf16(QChar *output) const { - writeUtf16((uint16_t *)output); + writeUtf16((quint16 *)output); } -void QHashedCStringRef::writeUtf16(uint16_t *output) const +void QHashedCStringRef::writeUtf16(quint16 *output) const { int l = m_length; const char *d = m_data; |