Some minimal changes to make qmlpuppet compile again

Access to QJSEnginePrivate::createCache and the previous
signature of QQmlPropertyCache::invalidate is used.

Change-Id: Ie2578eee33ee4ebb2cdc4574d8d1cb7c8209868e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

diff --git a/src/qml/jsapi/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h
index 3f7e91b..09fa24e 100644 (file)
--- a/src/qml/jsapi/qjsengine_p.h
+++ b/src/qml/jsapi/qjsengine_p.h
@@ -48,7 +48,7 @@
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/qmutex.h>
 #include "qjsengine.h"
-
+#include "private/qtqmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +58,7 @@ namespace QV4 {
 struct ExecutionEngine;
 }
 
-class QJSEnginePrivate : public QObjectPrivate
+class Q_QML_PRIVATE_EXPORT QJSEnginePrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QJSEngine)
 

diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 224de94..77bbd3d 100644 (file)
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -249,6 +249,8 @@ public:
 
     void update(const QMetaObject *);
     void invalidate(const QMetaObject *);
+    // Used by qmlpuppet. Remove as soon Creator requires Qt 5.5.
+    void invalidate(void *, const QMetaObject *mo) { invalidate(mo); }
 
     QQmlPropertyCache *copy();