From 893140169557eb06d79e783d38673217deab28c1 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@digia.com>
Date: Mon, 12 Sep 2016 14:13:30 +0200
Subject: QML: Fix xmlhttprequestdata leak

The creation and deletion condetion were different. We can
unconditionally delete it, because the field is always initialized to
nullptr.

Change-Id: If7d4528d9cdf03d81d37b3b4d4bd24fcd0fca8ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/qml/v8/qv8engine.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/qml/qml/v8/qv8engine.cpp')

diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index e08ff3b979..f15020f6c9 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -160,10 +160,9 @@ QV8Engine::~QV8Engine()
     qDeleteAll(m_extensionData);
     m_extensionData.clear();
 
-#if !defined(QT_NO_XMLSTREAMREADER) && defined(QT_NO_NETWORK)
     qt_rem_qmlxmlhttprequest(m_v4Engine, m_xmlHttpRequestData);
     m_xmlHttpRequestData = 0;
-#endif
+
     delete m_listModelData;
     m_listModelData = 0;
 
-- 
cgit v1.2.3