From 1f3f6d3e7d81dc11658a46003e86e921edb35bdf Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
Date: Wed, 1 Jun 2016 12:22:11 +0200
Subject: Remove QQmlCompiledData in favor of
 QV4::CompiledData::CompilationUnit

QQmlCompiledData used to contain the binary data for instantiating QML types in
the QML VME. Nowadays the QML type compiler as well as the JavaScript compiler
create a QV4::CompiledData::CompilationUnit.

Change-Id: I155f62a5ecfb55a3fe230520231b6d8fd5b28ac9
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp')

diff --git a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
index bf255ba6a0..f26d638082 100644
--- a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
+++ b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
@@ -31,7 +31,6 @@
 #include <QQmlComponent>
 #include <QTranslator>
 #include <QQmlContext>
-#include <private/qqmlcompiler_p.h>
 #include <private/qqmlengine_p.h>
 #include "../../shared/util.h"
 
@@ -77,15 +76,15 @@ void tst_qqmltranslation::translation()
         QQmlContext *context = qmlContext(object);
         QQmlEnginePrivate *engine = QQmlEnginePrivate::get(context->engine());
         QQmlTypeData *typeData = engine->typeLoader.getType(context->baseUrl());
-        QQmlCompiledData *cdata = typeData->compiledData();
-        QVERIFY(cdata);
+        QV4::CompiledData::CompilationUnit *compilationUnit = typeData->compilationUnit();
+        QVERIFY(compilationUnit);
 
         QSet<QString> compiledTranslations;
         compiledTranslations << QStringLiteral("basic")
                              << QStringLiteral("disambiguation")
                              << QStringLiteral("singular") << QStringLiteral("plural");
 
-        const QV4::CompiledData::Unit *unit = cdata->compilationUnit->data;
+        const QV4::CompiledData::Unit *unit = compilationUnit->data;
         const QV4::CompiledData::Object *rootObject = unit->objectAt(unit->indexOfRootObject);
         const QV4::CompiledData::Binding *binding = rootObject->bindingTable();
         for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) {
@@ -137,10 +136,10 @@ void tst_qqmltranslation::idTranslation()
         QQmlContext *context = qmlContext(object);
         QQmlEnginePrivate *engine = QQmlEnginePrivate::get(context->engine());
         QQmlTypeData *typeData = engine->typeLoader.getType(context->baseUrl());
-        QQmlCompiledData *cdata = typeData->compiledData();
-        QVERIFY(cdata);
+        QV4::CompiledData::CompilationUnit *compilationUnit = typeData->compilationUnit();
+        QVERIFY(compilationUnit);
 
-        const QV4::CompiledData::Unit *unit = cdata->compilationUnit->data;
+        const QV4::CompiledData::Unit *unit = compilationUnit->data;
         const QV4::CompiledData::Object *rootObject = unit->objectAt(unit->indexOfRootObject);
         const QV4::CompiledData::Binding *binding = rootObject->bindingTable();
         for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) {
-- 
cgit v1.2.3