From b71fa87e000c5d72d4b2a7146e450dc41dc69055 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Thu, 23 May 2013 15:23:06 +0200
Subject: Remove all references to the old v4 code

The old v4 files have already been removed, so cleanup
all the #ifdef'ed code that still references them.

Change-Id: Ifc5c59add5af36a61586a43b13291d7836cccd78
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/qml/qqmlcontext.cpp | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'src/qml/qml/qqmlcontext.cpp')

diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp
index 9b196a640e..3899f45aaf 100644
--- a/src/qml/qml/qqmlcontext.cpp
+++ b/src/qml/qml/qqmlcontext.cpp
@@ -48,9 +48,6 @@
 #include "qqmlengine_p.h"
 #include "qqmlengine.h"
 #include "qqmlinfo.h"
-#ifdef QT_USE_OLD_V4
-#include <private/qv4bindings_p.h>
-#endif
 #include <private/qv8bindings_p.h>
 
 #include <qjsengine.h>
@@ -521,9 +518,6 @@ QQmlContextData::QQmlContextData()
   propertyNames(0), contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0),
   expressions(0), contextObjects(0), contextGuards(0), idValues(0), idValueCount(0), linkedContext(0),
   componentAttached(0),
-#ifdef QT_USE_OLD_V4
-  v4bindings(0),
-#endif
   v8bindings(0)
 {
 }
@@ -535,9 +529,6 @@ QQmlContextData::QQmlContextData(QQmlContext *ctxt)
   propertyNames(0), contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0),
   expressions(0), contextObjects(0), contextGuards(0), idValues(0), idValueCount(0), linkedContext(0),
   componentAttached(0),
-#ifdef QT_USE_OLD_V4
-  v4bindings(0),
-#endif
   v8bindings(0)
 {
 }
@@ -646,11 +637,6 @@ void QQmlContextData::destroy()
     if (imports)
         imports->release();
 
-#ifdef QT_USE_OLD_V4
-    if (v4bindings)
-        v4bindings->release();
-#endif
-
     if (v8bindings)
         v8bindings->release();
 
-- 
cgit v1.2.3