diff --git a/tests/auto/qml/qmldesigner/common/statichelpers.cpp b/tests/auto/qml/qmldesigner/common/statichelpers.cpp index 4b108c43319700a11ffd127a60d10acf404104dd..7f393423d8046c167c841a474b22f710b6c9ea38 100644 --- a/tests/auto/qml/qmldesigner/common/statichelpers.cpp +++ b/tests/auto/qml/qmldesigner/common/statichelpers.cpp @@ -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) { diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro index b022bd85a04d05c2c5618bc6c9fea076427141f5..0c15be952024f2aa0036904bb24da84de59fcd36 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -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 diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 91d5e2d314b4c3e027cfaa21180946113612816b..8c905cf1ff2bea14e100efecd0aa948981faaa4c 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -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); diff --git a/tests/auto/qml/qmldesigner/testview.cpp b/tests/auto/qml/qmldesigner/testview.cpp index 9f91d49445167b5c09890ff3d654b0d5bdb1eba3..ce6860b2123af8595525a412725da520ae9441f6 100644 --- a/tests/auto/qml/qmldesigner/testview.cpp +++ b/tests/auto/qml/qmldesigner/testview.cpp @@ -30,6 +30,7 @@ #include "testview.h" #include <QDebug> +#include <QUrl> #include <qtestcase.h> #include <abstractproperty.h> #include <bindingproperty.h>