Commit ac8f94a8 authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

Test.QmlDesigner: removing declarative dependency



Change-Id: Ib15120c846187bd37cf22fae88ae6ece20d2417a
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent fe97a5a9
......@@ -69,19 +69,6 @@ static QString bareTemplate("import Qt 4.6\n"
"}");
static QString contentsTemplate(bareTemplate.arg("Text { id: textChild; x:10; y: 10; text: \"%1\"; %2 }"));
void printErrors(const QList<QDeclarativeError> &errors, const QString &fileName)
{
if (errors.isEmpty())
return;
qDebug() << "Error loading file \"" << fileName << "\":";
foreach (const QDeclarativeError &error, errors) {
qDebug() << error.line() << ":" << error.column() << ": " << error.description();
}
}
// TODO: this need to e updated for states
static bool compareProperty(const AbstractProperty &property1, const AbstractProperty &property2)
{
......
......@@ -13,7 +13,6 @@ unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PL
QT += script \
network \
declarative \
webkit
# DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
......
......@@ -63,9 +63,6 @@
#include <qmljs/qmljsinterpreter.h>
#include <QPlainTextEdit>
#include <private/qdeclarativestate_p.h>
#include <private/qdeclarativemetatype_p.h>
#include <QDeclarativeItem>
//TESTED_COMPONENT=src/plugins/qmldesigner/designercore
......@@ -331,7 +328,6 @@ void tst_TestCore::testRewriterErrors()
void tst_TestCore::saveEmptyCoreModel()
{
QList<QDeclarativeError> errors;
QFile file(":/fx/empty.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
......@@ -366,7 +362,6 @@ void tst_TestCore::saveEmptyCoreModel()
void tst_TestCore::loadAttributesInCoreModel()
{
QList<QDeclarativeError> errors;
QFile file(":/fx/attributes.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
......@@ -1815,7 +1810,7 @@ void tst_TestCore::testQmlModelView()
QCOMPARE(node3.instanceValue("width").toInt(), 0);
QCOMPARE(node3.instanceValue("x").toInt(), 20);
QVERIFY(!QDeclarativeMetaType::toQObject(node3.instanceValue("anchors.fill")));
//QVERIFY(!QDeclarativeMetaType::toQObject(node3.instanceValue("anchors.fill")));
node3.setBindingProperty("anchors.fill", "parent");
QCOMPARE(node3.instanceValue("x").toInt(), 0);
QCOMPARE(node3.instanceValue("width").toInt(), 20);
......
......@@ -30,6 +30,7 @@
#include "testview.h"
#include <QDebug>
#include <QUrl>
#include <qtestcase.h>
#include <abstractproperty.h>
#include <bindingproperty.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment