From 1583093081d6d74acd7618880c7d6101961f47ad Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Thu, 6 Feb 2014 16:47:29 +0100
Subject: [new compiler] Fix tst_qqmlincubator::deleteContext

Protect against QQmlContext deletion during incubation re-using the existing
QQmlContextGuard.

Change-Id: Ia1c0241029765cc2e00a9b0ffcf484127de20606
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/qml/qml/qqmlvme_p.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/qml/qml/qqmlvme_p.h')

diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index 5025653524..4da1aec74b 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -196,6 +196,7 @@ public:
     ~QQmlVMEGuard();
 
     void guard(QQmlVME *);
+    void guard(QmlObjectCreator *);
     void clear();
 
     bool isOK() const;
-- 
cgit v1.2.3