diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-03-12 12:26:55 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-03-12 12:41:02 +0100 |
commit | c19fe3d7e4f5e1de1bc4962cd68926ce59a0cb07 (patch) | |
tree | 34776e267285b9f33f9d1ffa3109f15b9154848c /tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp | |
parent | 1ed2874b4c12ef9cac0861bac83f323e2cc86db3 (diff) |
QmlDesigner: Fix autotest compilation
Diffstat (limited to 'tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp')
-rw-r--r-- | tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp index 2d7fd7a093..ce87286849 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp +++ b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp @@ -46,7 +46,7 @@ #include <QSpinBox> #include <QLineEdit> #include <QStackedWidget> -#include <QmlView> +#include <QDeclarativeView> #include <QVariant> using namespace QmlDesigner; @@ -61,7 +61,7 @@ static void inspectPropertyEditor(ModelNode node, QWidget* propWidget) QStackedWidget * stackedWidget = qobject_cast<QStackedWidget *> (propWidget); QVERIFY(stackedWidget); - QmlView *view = qobject_cast<QmlView*>(stackedWidget->currentWidget()); + QDeclarativeView *view = qobject_cast<QDeclarativeView*>(stackedWidget->currentWidget()); QVERIFY(view); QLineEdit * idLineEdit = view->findChild<QLineEdit* >("IdLineEdit"); @@ -146,7 +146,7 @@ static void loadFileAndTest(const QString &fileName) QFile file(fileName); QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); - QList<QmlError> errors; + QList<QDeclarativeError> errors; //std::auto_ptr<ByteArrayModifier> modifier1(ByteArrayModifier::create(QString(file.readAll()))); //std::auto_ptr<Model> model1(Model::create(modifier1.get(), QUrl::fromLocalFile(file.fileName()), &errors)); @@ -204,14 +204,14 @@ void TestPropertyEditor::createCoreModel() void TestPropertyEditor::loadEmptyCoreModel() { - /* QList<QmlError> errors; + /* QList<QDeclarativeError> errors; QFile file(":/fx/empty.qml"); QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); std::auto_ptr<QWidget> widget(new QWidget()); std::auto_ptr<ByteArrayModifier> modifier1(ByteArrayModifier::create(QString(file.readAll()))); std::auto_ptr<Model> model1(Model::create(modifier1.get(), QUrl(), &errors)); - foreach (const QmlError &error, errors) + foreach (const QDeclarativeError &error, errors) QFAIL(error.toString().toLatin1()); QVERIFY(model1.get()); setupPropertyEditor(widget.get(), model1.get()); @@ -220,7 +220,7 @@ void TestPropertyEditor::loadEmptyCoreModel() std::auto_ptr<ByteArrayModifier> modifier2(ByteArrayModifier::create("import Qt 4.6\n Item{}")); std::auto_ptr<Model> model2(Model::create(modifier2.get(), QUrl(), &errors)); - foreach (const QmlError &error, errors) + foreach (const QDeclarativeError &error, errors) QFAIL(error.toString().toLatin1()); QVERIFY(model2.get()); |