diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
commit | 0655209fdad022bd0f6eb20ce85522cb56506bf0 (patch) | |
tree | cdba0c1590655f5cb75a68cedff74f8a683db3a2 /src/qml/qml/ftw | |
parent | c3babc03c99c6ca5fa210486e133eb456a405bab (diff) | |
parent | 3d8f103c2641f35e7681485102a1b59886db8934 (diff) |
Merge master into api_changes
Conflicts:
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f
Diffstat (limited to 'src/qml/qml/ftw')
-rw-r--r-- | src/qml/qml/ftw/qhashedstring_p.h | 4 | ||||
-rw-r--r-- | src/qml/qml/ftw/qqmlpool.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h index f575285ff6..f058f21e98 100644 --- a/src/qml/qml/ftw/qhashedstring_p.h +++ b/src/qml/qml/ftw/qhashedstring_p.h @@ -59,6 +59,10 @@ #include <private/qflagpointer_p.h> +#if defined(Q_OS_QNX) +#include <stdlib.h> +#endif + QT_BEGIN_NAMESPACE // Enable this to debug hash linking assumptions. diff --git a/src/qml/qml/ftw/qqmlpool.cpp b/src/qml/qml/ftw/qqmlpool.cpp index 6fd11d4b1e..64df87ada5 100644 --- a/src/qml/qml/ftw/qqmlpool.cpp +++ b/src/qml/qml/ftw/qqmlpool.cpp @@ -41,6 +41,10 @@ #include "qqmlpool_p.h" +#ifdef Q_OS_QNX +#include <malloc.h> +#endif + // #define POOL_DEBUG QT_BEGIN_NAMESPACE |