summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-02-24 15:36:44 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-02-24 15:36:44 (GMT)
commit7acb1eeffa011651baf687fb66e5b6d3afbe2e86 (patch)
treec4bbc131730123f2e2e71b25ffe68e2747131995
parent327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5 (diff)
parentff92c1cd2bf5171637b51d5eb646b165d6f11ec3 (diff)
downloadQt-7acb1eeffa011651baf687fb66e5b6d3afbe2e86.zip
Qt-7acb1eeffa011651baf687fb66e5b6d3afbe2e86.tar.gz
Qt-7acb1eeffa011651baf687fb66e5b6d3afbe2e86.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
-rw-r--r--src/declarative/qml/qdeclarativeprivate.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index e8bbff4..01369d4 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -44,6 +44,9 @@
#include <QtCore/qglobal.h>
#include <QtCore/qvariant.h>
+#ifndef Q_OS_WIN
+#include <stdint.h>
+#endif
QT_BEGIN_HEADER