qt5: GCC 4.9 compile fix

Fixes #1515
This commit is contained in:
Christian Prochaska 2015-05-13 12:44:19 +02:00 committed by Christian Helmuth
parent ed4a821891
commit ebcfc28a5b
2 changed files with 16 additions and 2 deletions

View File

@ -1 +1 @@
2c75a650936656dc846dac362ff43e1d19a21c7f
821f07b61827f72f0efa968453ae521bf19fa6e8

View File

@ -4,14 +4,28 @@ From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
qtdeclarative/src/qml/qml/qqmlaccessors_p.h | 2
qtdeclarative/src/qml/qml/qqmlimport.cpp | 9
qtdeclarative/src/qml/qml/v8/qv8qobjectwrapper.cpp | 4
qtdeclarative/src/qml/types/qqmldelegatemodel_p.h | 2
qtjsbackend/src/3rdparty/v8/src/platform-genode.cc | 701 ++++++++++++++++++++
qtjsbackend/src/v8/v8.pri | 2
5 files changed, 716 insertions(+), 2 deletions(-)
6 files changed, 717 insertions(+), 3 deletions(-)
create mode 100644 qtjsbackend/src/3rdparty/v8/src/platform-genode.cc
diff --git a/qtdeclarative/src/qml/qml/qqmlaccessors_p.h b/qtdeclarative/src/qml/qml/qqmlaccessors_p.h
index 6df624e..1d61b5b 100644
--- a/qtdeclarative/src/qml/qml/qqmlaccessors_p.h
+++ b/qtdeclarative/src/qml/qml/qqmlaccessors_p.h
@@ -48,7 +48,7 @@
#include <QtCore/qhash.h>
#include <QtCore/QReadWriteLock>
-#if defined(Q_OS_QNX) || defined(Q_OS_LINUX)
+#if defined(Q_OS_QNX) || defined(Q_OS_LINUX) || defined(Q_OS_GENODE)
#include <stdint.h>
#endif
diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp
index 2fbb614..5816e9a 100644
--- a/qtdeclarative/src/qml/qml/qqmlimport.cpp