From 1f6bdc4f6b74629761b4f0e58eb1391f624dd876 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 10 Nov 2009 17:02:03 +1000 Subject: More Loader testing. --- tests/auto/declarative/declarative.pro | 2 +- tests/auto/declarative/qfxloader/NoResize.qml | 7 - tests/auto/declarative/qfxloader/Rect120x60.qml | 6 - .../declarative/qfxloader/SetSourceComponent.qml | 6 - tests/auto/declarative/qfxloader/SizeToItem.qml | 6 - tests/auto/declarative/qfxloader/SizeToLoader.qml | 7 - tests/auto/declarative/qfxloader/qfxloader.pro | 7 - tests/auto/declarative/qfxloader/tst_qfxloader.cpp | 218 ---------------- .../declarative/qmlgraphicsloader/NoResize.qml | 7 + .../declarative/qmlgraphicsloader/Rect120x60.qml | 6 + .../qmlgraphicsloader/SetSourceComponent.qml | 6 + .../declarative/qmlgraphicsloader/SizeToItem.qml | 6 + .../declarative/qmlgraphicsloader/SizeToLoader.qml | 7 + .../qmlgraphicsloader/qmlgraphicsloader.pro | 7 + .../qmlgraphicsloader/tst_qmlgraphicsloader.cpp | 283 +++++++++++++++++++++ 15 files changed, 323 insertions(+), 258 deletions(-) delete mode 100644 tests/auto/declarative/qfxloader/NoResize.qml delete mode 100644 tests/auto/declarative/qfxloader/Rect120x60.qml delete mode 100644 tests/auto/declarative/qfxloader/SetSourceComponent.qml delete mode 100644 tests/auto/declarative/qfxloader/SizeToItem.qml delete mode 100644 tests/auto/declarative/qfxloader/SizeToLoader.qml delete mode 100644 tests/auto/declarative/qfxloader/qfxloader.pro delete mode 100644 tests/auto/declarative/qfxloader/tst_qfxloader.cpp create mode 100644 tests/auto/declarative/qmlgraphicsloader/NoResize.qml create mode 100644 tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml create mode 100644 tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml create mode 100644 tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml create mode 100644 tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml create mode 100644 tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro create mode 100644 tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 930eb09..17c2d2a 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -12,7 +12,7 @@ SUBDIRS += \ numberformatter \ # Cover parserstress \ # Cover pathview \ # Cover - qfxloader \ # Cover + qmlgraphicsloader \ # Cover qmetaobjectbuilder \ # Cover qmlbinding \ # Cover qmlconnection \ # Cover diff --git a/tests/auto/declarative/qfxloader/NoResize.qml b/tests/auto/declarative/qfxloader/NoResize.qml deleted file mode 100644 index cfbb55a..0000000 --- a/tests/auto/declarative/qfxloader/NoResize.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt 4.6 - -Loader { - resizeMode: "NoResize" - width: 200; height: 80 - source: "Rect120x60.qml" -} diff --git a/tests/auto/declarative/qfxloader/Rect120x60.qml b/tests/auto/declarative/qfxloader/Rect120x60.qml deleted file mode 100644 index aa4b0c2..0000000 --- a/tests/auto/declarative/qfxloader/Rect120x60.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt 4.6 - -Rectangle { - width: 120 - height:60 -} diff --git a/tests/auto/declarative/qfxloader/SetSourceComponent.qml b/tests/auto/declarative/qfxloader/SetSourceComponent.qml deleted file mode 100644 index 1db56c4..0000000 --- a/tests/auto/declarative/qfxloader/SetSourceComponent.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt 4.6 - -Item { - Component { id: comp; Rectangle { width: 100; height: 50 } } - Loader { sourceComponent: comp } -} diff --git a/tests/auto/declarative/qfxloader/SizeToItem.qml b/tests/auto/declarative/qfxloader/SizeToItem.qml deleted file mode 100644 index b52fa03..0000000 --- a/tests/auto/declarative/qfxloader/SizeToItem.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Qt 4.6 - -Loader { - resizeMode: "SizeLoaderToItem" - source: "Rect120x60.qml" -} diff --git a/tests/auto/declarative/qfxloader/SizeToLoader.qml b/tests/auto/declarative/qfxloader/SizeToLoader.qml deleted file mode 100644 index 1a107e1..0000000 --- a/tests/auto/declarative/qfxloader/SizeToLoader.qml +++ /dev/null @@ -1,7 +0,0 @@ -import Qt 4.6 - -Loader { - resizeMode: "SizeItemToLoader" - width: 200; height: 80 - source: "Rect120x60.qml" -} diff --git a/tests/auto/declarative/qfxloader/qfxloader.pro b/tests/auto/declarative/qfxloader/qfxloader.pro deleted file mode 100644 index aee52cc..0000000 --- a/tests/auto/declarative/qfxloader/qfxloader.pro +++ /dev/null @@ -1,7 +0,0 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui -macx:CONFIG -= app_bundle - -SOURCES += tst_qfxloader.cpp - -DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qfxloader/tst_qfxloader.cpp b/tests/auto/declarative/qfxloader/tst_qfxloader.cpp deleted file mode 100644 index 9a3da90..0000000 --- a/tests/auto/declarative/qfxloader/tst_qfxloader.cpp +++ /dev/null @@ -1,218 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include -#include -#include -#include - -class tst_qfxloader : public QObject - -{ - Q_OBJECT -public: - tst_qfxloader(); - -private slots: - void url(); - void component(); - void clear(); - void urlToComponent(); - void componentToUrl(); - void sizeLoaderToItem(); - void sizeItemToLoader(); - void noResize(); - -private: - QmlEngine engine; -}; - -/* -inline QUrl TEST_FILE(const QString &filename) -{ - QFileInfo fileInfo(__FILE__); - return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename)); -} - -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} -*/ - -tst_qfxloader::tst_qfxloader() -{ -} - -void tst_qfxloader::url() -{ - QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), QUrl("file://" SRCDIR "/")); - QmlGraphicsLoader *loader = qobject_cast(component.create()); - QVERIFY(loader != 0); - QVERIFY(loader->item()); - QCOMPARE(loader->progress(), 1.0); - QCOMPARE(static_cast(loader)->children().count(), 1); - - delete loader; -} - -void tst_qfxloader::component() -{ - QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml")); - QmlGraphicsItem *item = qobject_cast(component.create()); - QVERIFY(item); - - QmlGraphicsLoader *loader = qobject_cast(item->QGraphicsObject::children().at(1)); - QVERIFY(loader); - QVERIFY(loader->item()); - QCOMPARE(loader->progress(), 1.0); - QCOMPARE(static_cast(loader)->children().count(), 1); - - delete loader; -} - -void tst_qfxloader::clear() -{ - QmlComponent component(&engine, QByteArray( - "import Qt 4.6\n" - " Loader { id: loader\n" - " source: 'Rect120x60.qml'\n" - " Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n" - " }") - , QUrl("file://" SRCDIR "/")); - QmlGraphicsLoader *loader = qobject_cast(component.create()); - QVERIFY(loader != 0); - QVERIFY(loader->item()); - QCOMPARE(loader->progress(), 1.0); - QCOMPARE(static_cast(loader)->children().count(), 1); - - QTest::qWait(500); - - QVERIFY(loader->item() == 0); - QCOMPARE(loader->progress(), 0.0); - QCOMPARE(static_cast(loader)->children().count(), 0); - - delete loader; -} - -void tst_qfxloader::urlToComponent() -{ - QmlComponent component(&engine, QByteArray("import Qt 4.6\n" - "Loader {\n" - " id: loader\n" - " Component { id: myComp; Rectangle { width: 10; height: 10 } }\n" - " source: \"Rect120x60.qml\"\n" - " Timer { interval: 100; running: true; onTriggered: loader.sourceComponent = myComp }\n" - "}" ) - , QUrl("file://" SRCDIR "/")); - QmlGraphicsLoader *loader = qobject_cast(component.create()); - QTest::qWait(500); - QVERIFY(loader != 0); - QVERIFY(loader->item()); - QCOMPARE(loader->progress(), 1.0); - QCOMPARE(static_cast(loader)->children().count(), 1); - QCOMPARE(loader->width(), 10.0); - QCOMPARE(loader->height(), 10.0); - - delete loader; -} - -void tst_qfxloader::componentToUrl() -{ - QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml")); - QmlGraphicsItem *item = qobject_cast(component.create()); - QVERIFY(item); - - QmlGraphicsLoader *loader = qobject_cast(item->QGraphicsObject::children().at(1)); - QVERIFY(loader); - QVERIFY(loader->item()); - QCOMPARE(loader->progress(), 1.0); - QCOMPARE(static_cast(loader)->children().count(), 1); - - loader->setSource(QUrl("file://" SRCDIR "/Rect120x60.qml")); - QVERIFY(loader->item()); - QCOMPARE(loader->progress(), 1.0); - QCOMPARE(static_cast(loader)->children().count(), 1); - QCOMPARE(loader->width(), 120.0); - QCOMPARE(loader->height(), 60.0); - - delete loader; -} - -void tst_qfxloader::sizeLoaderToItem() -{ - QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToItem.qml")); - QmlGraphicsLoader *loader = qobject_cast(component.create()); - QVERIFY(loader != 0); - QCOMPARE(loader->width(), 120.0); - QCOMPARE(loader->height(), 60.0); -} - -void tst_qfxloader::sizeItemToLoader() -{ - QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToLoader.qml")); - QmlGraphicsLoader *loader = qobject_cast(component.create()); - QVERIFY(loader != 0); - QCOMPARE(loader->width(), 200.0); - QCOMPARE(loader->height(), 80.0); - - QmlGraphicsItem *rect = loader->item(); - QVERIFY(rect); - QCOMPARE(rect->width(), 200.0); - QCOMPARE(rect->height(), 80.0); -} - -void tst_qfxloader::noResize() -{ - QmlComponent component(&engine, QUrl("file://" SRCDIR "/NoResize.qml")); - QmlGraphicsLoader *loader = qobject_cast(component.create()); - QVERIFY(loader != 0); - QCOMPARE(loader->width(), 200.0); - QCOMPARE(loader->height(), 80.0); - - QmlGraphicsItem *rect = loader->item(); - QVERIFY(rect); - QCOMPARE(rect->width(), 120.0); - QCOMPARE(rect->height(), 60.0); -} - -QTEST_MAIN(tst_qfxloader) - -#include "tst_qfxloader.moc" diff --git a/tests/auto/declarative/qmlgraphicsloader/NoResize.qml b/tests/auto/declarative/qmlgraphicsloader/NoResize.qml new file mode 100644 index 0000000..cfbb55a --- /dev/null +++ b/tests/auto/declarative/qmlgraphicsloader/NoResize.qml @@ -0,0 +1,7 @@ +import Qt 4.6 + +Loader { + resizeMode: "NoResize" + width: 200; height: 80 + source: "Rect120x60.qml" +} diff --git a/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml b/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml new file mode 100644 index 0000000..aa4b0c2 --- /dev/null +++ b/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Rectangle { + width: 120 + height:60 +} diff --git a/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml b/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml new file mode 100644 index 0000000..1db56c4 --- /dev/null +++ b/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Item { + Component { id: comp; Rectangle { width: 100; height: 50 } } + Loader { sourceComponent: comp } +} diff --git a/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml b/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml new file mode 100644 index 0000000..b52fa03 --- /dev/null +++ b/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Loader { + resizeMode: "SizeLoaderToItem" + source: "Rect120x60.qml" +} diff --git a/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml b/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml new file mode 100644 index 0000000..1a107e1 --- /dev/null +++ b/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml @@ -0,0 +1,7 @@ +import Qt 4.6 + +Loader { + resizeMode: "SizeItemToLoader" + width: 200; height: 80 + source: "Rect120x60.qml" +} diff --git a/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro b/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro new file mode 100644 index 0000000..8be8cdf --- /dev/null +++ b/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro @@ -0,0 +1,7 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative gui +macx:CONFIG -= app_bundle + +SOURCES += tst_qmlgraphicsloader.cpp + +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp new file mode 100644 index 0000000..8fda991 --- /dev/null +++ b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp @@ -0,0 +1,283 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include +#include +#include +#include + +class tst_QmlGraphicsLoader : public QObject + +{ + Q_OBJECT +public: + tst_QmlGraphicsLoader(); + +private slots: + void url(); + void invalidUrl(); + void component(); + void clear(); + void urlToComponent(); + void componentToUrl(); + void sizeLoaderToItem(); + void sizeItemToLoader(); + void noResize(); + +private: + QmlEngine engine; +}; + +/* +inline QUrl TEST_FILE(const QString &filename) +{ + QFileInfo fileInfo(__FILE__); + return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename)); +} + +inline QUrl TEST_FILE(const char *filename) +{ + return TEST_FILE(QLatin1String(filename)); +} +*/ + +tst_QmlGraphicsLoader::tst_QmlGraphicsLoader() +{ +} + +void tst_QmlGraphicsLoader::url() +{ + QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), QUrl("file://" SRCDIR "/")); + QmlGraphicsLoader *loader = qobject_cast(component.create()); + QVERIFY(loader != 0); + QVERIFY(loader->item()); + QVERIFY(loader->source() == QUrl("file://" SRCDIR "/Rect120x60.qml")); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(loader->status(), QmlGraphicsLoader::Ready); + QCOMPARE(static_cast(loader)->children().count(), 1); + + delete loader; +} + +void tst_QmlGraphicsLoader::component() +{ + QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml")); + QmlGraphicsItem *item = qobject_cast(component.create()); + QVERIFY(item); + + QmlGraphicsLoader *loader = qobject_cast(item->QGraphicsObject::children().at(1)); + QVERIFY(loader); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(loader->status(), QmlGraphicsLoader::Ready); + QCOMPARE(static_cast(loader)->children().count(), 1); + + delete loader; +} + +void tst_QmlGraphicsLoader::invalidUrl() +{ +// QTest::ignoreMessage(QtWarningMsg, "(:-1: File error for URL file://" SRCDIR "/IDontExist.qml)"); + + QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"IDontExist.qml\" }"), QUrl("file://" SRCDIR "/")); + QmlGraphicsLoader *loader = qobject_cast(component.create()); + QVERIFY(loader != 0); + QVERIFY(loader->item() == 0); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(loader->status(), QmlGraphicsLoader::Error); + QCOMPARE(static_cast(loader)->children().count(), 0); + + delete loader; +} + +void tst_QmlGraphicsLoader::clear() +{ + { + QmlComponent component(&engine, QByteArray( + "import Qt 4.6\n" + " Loader { id: loader\n" + " source: 'Rect120x60.qml'\n" + " Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n" + " }") + , QUrl("file://" SRCDIR "/")); + QmlGraphicsLoader *loader = qobject_cast(component.create()); + QVERIFY(loader != 0); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(static_cast(loader)->children().count(), 1); + + QTest::qWait(500); + + QVERIFY(loader->item() == 0); + QCOMPARE(loader->progress(), 0.0); + QCOMPARE(loader->status(), QmlGraphicsLoader::Null); + QCOMPARE(static_cast(loader)->children().count(), 0); + + delete loader; + } + { + QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml")); + QmlGraphicsItem *item = qobject_cast(component.create()); + QVERIFY(item); + + QmlGraphicsLoader *loader = qobject_cast(item->QGraphicsObject::children().at(1)); + QVERIFY(loader); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(static_cast(loader)->children().count(), 1); + + loader->setSourceComponent(0); + + QVERIFY(loader->item() == 0); + QCOMPARE(loader->progress(), 0.0); + QCOMPARE(loader->status(), QmlGraphicsLoader::Null); + QCOMPARE(static_cast(loader)->children().count(), 0); + + delete loader; + } +} + +void tst_QmlGraphicsLoader::urlToComponent() +{ + QmlComponent component(&engine, QByteArray("import Qt 4.6\n" + "Loader {\n" + " id: loader\n" + " Component { id: myComp; Rectangle { width: 10; height: 10 } }\n" + " source: \"Rect120x60.qml\"\n" + " Timer { interval: 100; running: true; onTriggered: loader.sourceComponent = myComp }\n" + "}" ) + , QUrl("file://" SRCDIR "/")); + QmlGraphicsLoader *loader = qobject_cast(component.create()); + QTest::qWait(500); + QVERIFY(loader != 0); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(static_cast(loader)->children().count(), 1); + QCOMPARE(loader->width(), 10.0); + QCOMPARE(loader->height(), 10.0); + + delete loader; +} + +void tst_QmlGraphicsLoader::componentToUrl() +{ + QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml")); + QmlGraphicsItem *item = qobject_cast(component.create()); + QVERIFY(item); + + QmlGraphicsLoader *loader = qobject_cast(item->QGraphicsObject::children().at(1)); + QVERIFY(loader); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(static_cast(loader)->children().count(), 1); + + loader->setSource(QUrl("file://" SRCDIR "/Rect120x60.qml")); + QVERIFY(loader->item()); + QCOMPARE(loader->progress(), 1.0); + QCOMPARE(static_cast(loader)->children().count(), 1); + QCOMPARE(loader->width(), 120.0); + QCOMPARE(loader->height(), 60.0); + + delete loader; +} + +void tst_QmlGraphicsLoader::sizeLoaderToItem() +{ + QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToItem.qml")); + QmlGraphicsLoader *loader = qobject_cast(component.create()); + QVERIFY(loader != 0); + QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeLoaderToItem); + QCOMPARE(loader->width(), 120.0); + QCOMPARE(loader->height(), 60.0); + + // Check resize + QmlGraphicsItem *rect = loader->item(); + QVERIFY(rect); + rect->setWidth(150); + rect->setHeight(45); + QCOMPARE(loader->width(), 150.0); + QCOMPARE(loader->height(), 45.0); + + // Switch mode + loader->setResizeMode(QmlGraphicsLoader::SizeItemToLoader); + loader->setWidth(180); + loader->setHeight(30); + QCOMPARE(rect->width(), 180.0); + QCOMPARE(rect->height(), 30.0); +} + +void tst_QmlGraphicsLoader::sizeItemToLoader() +{ + QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToLoader.qml")); + QmlGraphicsLoader *loader = qobject_cast(component.create()); + QVERIFY(loader != 0); + QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeItemToLoader); + QCOMPARE(loader->width(), 200.0); + QCOMPARE(loader->height(), 80.0); + + QmlGraphicsItem *rect = loader->item(); + QVERIFY(rect); + QCOMPARE(rect->width(), 200.0); + QCOMPARE(rect->height(), 80.0); + + // Check resize + loader->setWidth(180); + loader->setHeight(30); + QCOMPARE(rect->width(), 180.0); + QCOMPARE(rect->height(), 30.0); +} + +void tst_QmlGraphicsLoader::noResize() +{ + QmlComponent component(&engine, QUrl("file://" SRCDIR "/NoResize.qml")); + QmlGraphicsLoader *loader = qobject_cast(component.create()); + QVERIFY(loader != 0); + QCOMPARE(loader->width(), 200.0); + QCOMPARE(loader->height(), 80.0); + + QmlGraphicsItem *rect = loader->item(); + QVERIFY(rect); + QCOMPARE(rect->width(), 120.0); + QCOMPARE(rect->height(), 60.0); +} + +QTEST_MAIN(tst_QmlGraphicsLoader) + +#include "tst_qmlgraphicsloader.moc" -- cgit v0.12 From 09afa79bfb9e7af1b72167cab9a24172fc95cc9f Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Tue, 10 Nov 2009 17:23:18 +1000 Subject: Ids should be lowercase --- src/gui/graphicsview/qgraphicsanchorlayout_p.h | 2 +- tests/auto/declarative/anchors/data/anchors.qml | 86 +++++++++++----------- tests/auto/declarative/anchors/data/illegal1.qml | 8 +- tests/auto/declarative/anchors/data/illegal2.qml | 8 +- tests/auto/declarative/anchors/data/illegal3.qml | 4 +- tests/auto/declarative/anchors/data/loop1.qml | 4 +- tests/auto/declarative/anchors/data/loop2.qml | 8 +- tests/auto/declarative/anchors/tst_anchors.cpp | 62 ++++++++-------- .../qmlgraphicsflickable/flickable-horizontal.qml | 12 +-- .../qmlgraphicsflickable/flickable-vertical.qml | 4 +- .../visual/qmlgraphicstext/elide/elide.qml | 4 +- .../visual/qmlgraphicstext/elide/multilength.qml | 6 +- tests/auto/declarative/visual/repeater/basic1.qml | 1 - tests/auto/declarative/visual/repeater/basic2.qml | 5 +- tests/auto/declarative/visual/repeater/basic3.qml | 5 +- tests/auto/declarative/visual/repeater/basic4.qml | 9 +-- .../visual/scriptAction/scriptAction.qml | 4 +- 17 files changed, 114 insertions(+), 118 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h index 3ef37f9..2f68d73 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h @@ -267,7 +267,7 @@ inline QString AnchorVertex::toString() const const AnchorVertexPair *vp = static_cast(this); return QString::fromAscii("(%1, %2)").arg(vp->m_first->toString()).arg(vp->m_second->toString()); } else if (!m_item) { - return QString::fromAscii("NULL_%1").arg(int(this)); + return "";//QString::fromAscii("NULL_%1").arg(int(this)); } QString edge; switch (m_edge) { diff --git a/tests/auto/declarative/anchors/data/anchors.qml b/tests/auto/declarative/anchors/data/anchors.qml index 765e5b6..b3fba30 100644 --- a/tests/auto/declarative/anchors/data/anchors.qml +++ b/tests/auto/declarative/anchors/data/anchors.qml @@ -4,130 +4,130 @@ Rectangle { color: "white" width: 240 height: 320 - Rectangle { id: MasterRect; objectName: "MasterRect"; x: 26; width: 96; height: 20; color: "red" } + Rectangle { id: masterRect; objectName: "masterRect"; x: 26; width: 96; height: 20; color: "red" } Rectangle { - id: Rect1; objectName: "Rect1" + id: rect1; objectName: "rect1" y: 20; width: 10; height: 10 - anchors.left: MasterRect.left + anchors.left: masterRect.left } Rectangle { - id: Rect2; objectName: "Rect2" + id: rect2; objectName: "rect2" y: 20; width: 10; height: 10 - anchors.left: MasterRect.right + anchors.left: masterRect.right } Rectangle { - id: Rect3; objectName: "Rect3" + id: rect3; objectName: "rect3" y: 20; width: 10; height: 10 - anchors.left: MasterRect.horizontalCenter + anchors.left: masterRect.horizontalCenter } Rectangle { - id: Rect4; objectName: "Rect4" + id: rect4; objectName: "rect4" y: 30; width: 10; height: 10 - anchors.right: MasterRect.left + anchors.right: masterRect.left } Rectangle { - id: Rect5; objectName: "Rect5" + id: rect5; objectName: "rect5" y: 30; width: 10; height: 10 - anchors.right: MasterRect.right + anchors.right: masterRect.right } Rectangle { - id: Rect6; objectName: "Rect6" + id: rect6; objectName: "rect6" y: 30; width: 10; height: 10 - anchors.right: MasterRect.horizontalCenter + anchors.right: masterRect.horizontalCenter } Rectangle { - id: Rect7; objectName: "Rect7" + id: rect7; objectName: "rect7" y: 50; width: 10; height: 10 anchors.left: parent.left } Rectangle { - id: Rect8; objectName: "Rect8" + id: rect8; objectName: "rect8" y: 50; width: 10; height: 10 anchors.left: parent.right } Rectangle { - id: Rect9; objectName: "Rect9" + id: rect9; objectName: "rect9" y: 50; width: 10; height: 10 anchors.left: parent.horizontalCenter } Rectangle { - id: Rect10; objectName: "Rect10" + id: rect10; objectName: "rect10" y: 60; width: 10; height: 10 anchors.right: parent.left } Rectangle { - id: Rect11; objectName: "Rect11" + id: rect11; objectName: "rect11" y: 60; width: 10; height: 10 anchors.right: parent.right } Rectangle { - id: Rect12; objectName: "Rect12" + id: rect12; objectName: "rect12" y: 60; width: 10; height: 10 anchors.right: parent.horizontalCenter } Rectangle { - id: Rect13; objectName: "Rect13" + id: rect13; objectName: "rect13" x: 200; width: 10; height: 10 - anchors.top: MasterRect.bottom + anchors.top: masterRect.bottom } Rectangle { - id: Rect14; objectName: "Rect14" + id: rect14; objectName: "rect14" width: 10; height: 10; color: "steelblue" anchors.verticalCenter: parent.verticalCenter } Rectangle { - id: Rect15; objectName: "Rect15" + id: rect15; objectName: "rect15" y: 200; height: 10 - anchors.left: MasterRect.left - anchors.right: MasterRect.right + anchors.left: masterRect.left + anchors.right: masterRect.right } Rectangle { - id: Rect16; objectName: "Rect16" + id: rect16; objectName: "rect16" y: 220; height: 10 - anchors.left: MasterRect.left - anchors.horizontalCenter: MasterRect.right + anchors.left: masterRect.left + anchors.horizontalCenter: masterRect.right } Rectangle { - id: Rect17; objectName: "Rect17" + id: rect17; objectName: "rect17" y: 240; height: 10 - anchors.right: MasterRect.right - anchors.horizontalCenter: MasterRect.left + anchors.right: masterRect.right + anchors.horizontalCenter: masterRect.left } Rectangle { - id: Rect18; objectName: "Rect18" + id: rect18; objectName: "rect18" x: 180; width: 10 - anchors.top: MasterRect.bottom + anchors.top: masterRect.bottom anchors.bottom: Rect12.top } Rectangle { - id: Rect19; objectName: "Rect19" + id: rect19; objectName: "rect19" y: 70; width: 10; height: 10 anchors.horizontalCenter: parent.horizontalCenter } Rectangle { - id: Rect20; objectName: "Rect20" + id: rect20; objectName: "rect20" y: 70; width: 10; height: 10 anchors.horizontalCenter: parent.right } Rectangle { - id: Rect21; objectName: "Rect21" + id: rect21; objectName: "rect21" y: 70; width: 10; height: 10 anchors.horizontalCenter: parent.left } Rectangle { - id: Rect22; objectName: "Rect22" + id: rect22; objectName: "rect22" width: 10; height: 10 - anchors.centerIn: MasterRect + anchors.centerIn: masterRect } Rectangle { - id: Rect23; objectName: "Rect23" - anchors.left: MasterRect.left + id: rect23; objectName: "rect23" + anchors.left: masterRect.left anchors.leftMargin: 5 - anchors.right: MasterRect.right + anchors.right: masterRect.right anchors.rightMargin: 5 - anchors.top: MasterRect.top + anchors.top: masterRect.top anchors.topMargin: 5 - anchors.bottom: MasterRect.bottom + anchors.bottom: masterRect.bottom anchors.bottomMargin: 5 } Text { diff --git a/tests/auto/declarative/anchors/data/illegal1.qml b/tests/auto/declarative/anchors/data/illegal1.qml index 0a960d0..53af443 100644 --- a/tests/auto/declarative/anchors/data/illegal1.qml +++ b/tests/auto/declarative/anchors/data/illegal1.qml @@ -3,10 +3,10 @@ import Qt 4.6 Rectangle { id: rect width: 120; height: 200; color: "white" - Rectangle { id: TheRect; width: 100; height: 100 } + Rectangle { id: theRect; width: 100; height: 100 } Rectangle { - anchors.left: TheRect.left - anchors.right: TheRect.right - anchors.horizontalCenter: TheRect.horizontalCenter + anchors.left: theRect.left + anchors.right: theRect.right + anchors.horizontalCenter: theRect.horizontalCenter } } diff --git a/tests/auto/declarative/anchors/data/illegal2.qml b/tests/auto/declarative/anchors/data/illegal2.qml index 2497738..978be52 100644 --- a/tests/auto/declarative/anchors/data/illegal2.qml +++ b/tests/auto/declarative/anchors/data/illegal2.qml @@ -3,11 +3,11 @@ import Qt 4.6 Rectangle { id: rect width: 120; height: 200; color: "white" - Text { id: Text1; text: "Hello" } + Text { id: text1; text: "Hello" } Text { - id: Text2; - anchors.baseline: Text1.baseline; - anchors.top: Text1.top; + id: text2; + anchors.baseline: text1.baseline; + anchors.top: text1.top; text: "World" } } diff --git a/tests/auto/declarative/anchors/data/illegal3.qml b/tests/auto/declarative/anchors/data/illegal3.qml index 27b2e4d..065ceb5 100644 --- a/tests/auto/declarative/anchors/data/illegal3.qml +++ b/tests/auto/declarative/anchors/data/illegal3.qml @@ -4,9 +4,9 @@ Rectangle { id: rect width: 120; height: 200; color: "white" Item { - Rectangle { id: TheRect; width: 100; height: 100 } + Rectangle { id: theRect; width: 100; height: 100 } } Rectangle { - anchors.left: TheRect.left + anchors.left: theRect.left } } diff --git a/tests/auto/declarative/anchors/data/loop1.qml b/tests/auto/declarative/anchors/data/loop1.qml index ef6b63d..a266612 100644 --- a/tests/auto/declarative/anchors/data/loop1.qml +++ b/tests/auto/declarative/anchors/data/loop1.qml @@ -3,6 +3,6 @@ import Qt 4.6 Rectangle { id: rect width: 120; height: 200; color: "white" - Text { id: Text1; anchors.right: Text2.right; text: "Hello" } - Text { id: Text2; anchors.right: Text1.right; anchors.rightMargin: 10; text: "World" } + Text { id: text1; anchors.right: text2.right; text: "Hello" } + Text { id: text2; anchors.right: text1.right; anchors.rightMargin: 10; text: "World" } } diff --git a/tests/auto/declarative/anchors/data/loop2.qml b/tests/auto/declarative/anchors/data/loop2.qml index 2445a15..acb57cd 100644 --- a/tests/auto/declarative/anchors/data/loop2.qml +++ b/tests/auto/declarative/anchors/data/loop2.qml @@ -6,15 +6,15 @@ Rectangle { height: 600; Image { - id: Image1 + id: image1 source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/3311388091_ac2a257feb.jpg" - anchors.right: Image2.left + anchors.right: image2.left } Image { - id: Image2 + id: image2 source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/oslo_groupphoto.jpg" - anchors.left: Image1.right + anchors.left: image1.right anchors.leftMargin: 20 } } diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/anchors/tst_anchors.cpp index 4c85d2d..34c1e01 100644 --- a/tests/auto/declarative/anchors/tst_anchors.cpp +++ b/tests/auto/declarative/anchors/tst_anchors.cpp @@ -97,51 +97,51 @@ void tst_anchors::basicAnchors() qApp->processEvents(); //sibling horizontal - QCOMPARE(findItem(view->root(), QLatin1String("Rect1"))->x(), 26.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect2"))->x(), 122.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect3"))->x(), 74.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect4"))->x(), 16.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect5"))->x(), 112.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect6"))->x(), 64.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect1"))->x(), 26.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect2"))->x(), 122.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect3"))->x(), 74.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect4"))->x(), 16.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect5"))->x(), 112.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect6"))->x(), 64.0); //parent horizontal - QCOMPARE(findItem(view->root(), QLatin1String("Rect7"))->x(), 0.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect8"))->x(), 240.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect9"))->x(), 120.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect10"))->x(), -10.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect11"))->x(), 230.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect12"))->x(), 110.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect7"))->x(), 0.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect8"))->x(), 240.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect9"))->x(), 120.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect10"))->x(), -10.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect11"))->x(), 230.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect12"))->x(), 110.0); //vertical - QCOMPARE(findItem(view->root(), QLatin1String("Rect13"))->y(), 20.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect14"))->y(), 155.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect13"))->y(), 20.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect14"))->y(), 155.0); //stretch - QCOMPARE(findItem(view->root(), QLatin1String("Rect15"))->x(), 26.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect15"))->width(), 96.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect16"))->x(), 26.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect16"))->width(), 192.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect17"))->x(), -70.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect17"))->width(), 192.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect15"))->x(), 26.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect15"))->width(), 96.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect16"))->x(), 26.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect16"))->width(), 192.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect17"))->x(), -70.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect17"))->width(), 192.0); //vertical stretch - QCOMPARE(findItem(view->root(), QLatin1String("Rect18"))->y(), 20.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect18"))->height(), 40.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect18"))->y(), 20.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect18"))->height(), 40.0); //more parent horizontal - QCOMPARE(findItem(view->root(), QLatin1String("Rect19"))->x(), 115.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect20"))->x(), 235.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect21"))->x(), -5.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect19"))->x(), 115.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect20"))->x(), 235.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect21"))->x(), -5.0); //centerIn - QCOMPARE(findItem(view->root(), QLatin1String("Rect22"))->x(), 69.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect22"))->y(), 5.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect22"))->x(), 69.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect22"))->y(), 5.0); //margins - QCOMPARE(findItem(view->root(), QLatin1String("Rect23"))->x(), 31.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect23"))->y(), 5.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect23"))->width(), 86.0); - QCOMPARE(findItem(view->root(), QLatin1String("Rect23"))->height(), 10.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect23"))->x(), 31.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect23"))->y(), 5.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect23"))->width(), 86.0); + QCOMPARE(findItem(view->root(), QLatin1String("rect23"))->height(), 10.0); //baseline QmlGraphicsText *text1 = findItem(view->root(), QLatin1String("text1")); diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml index 2b4f55d..1a7366d 100644 --- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml +++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml @@ -5,7 +5,7 @@ Rectangle { width: 600; height: 300 ListModel { - id: List + id: list ListElement { dayColor: "steelblue" } ListElement { dayColor: "blue" } ListElement { dayColor: "yellow" } @@ -16,22 +16,22 @@ Rectangle { } Flickable { - id: Flick + id: flickable anchors.fill: parent; viewportWidth: row.width Row { id: row Repeater { - model: List + model: list Rectangle { width: 200; height: 300; color: dayColor } } } } Rectangle { radius: 3 - y: Flick.height-8 + y: flickable.height-8 height: 8 - x: Flick.visibleArea.xPosition * Flick.width - width: Flick.visibleArea.widthRatio * Flick.width + x: flickable.visibleArea.xPosition * flickable.width + width: flickable.visibleArea.widthRatio * flickable.width } } diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml index 0d6bbed..a1885c4 100644 --- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml +++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml @@ -5,7 +5,7 @@ Rectangle { width: 300; height: 600 ListModel { - id: List + id: list ListElement { dayColor: "steelblue" } ListElement { dayColor: "blue" } ListElement { dayColor: "yellow" } @@ -22,7 +22,7 @@ Rectangle { Column { id: column Repeater { - model: List + model: list Rectangle { width: 300; height: 200; color: dayColor } } } diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml index 3c9ea5b..fa6b5da 100644 --- a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml @@ -5,12 +5,12 @@ Rectangle { height: childrenRect.height Column { width: 80 - height: MyText.height*4 + height: myText.height*4 Text { elide: "ElideLeft" text: "aaa bbb ccc ddd eee fff" width: 80 - id: MyText + id: myText } Text { elide: "ElideMiddle" diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml index fa74cc4..081971c 100644 --- a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml @@ -5,12 +5,12 @@ Rectangle { height: 50 color: "lightBlue" Rectangle { - width: MyText.width - height: MyText.height + width: myText.width + height: myText.height color: "white" anchors.centerIn: parent Text { - id: MyText + id: myText width: NumberAnimation { from: 500; to: 0; running: true; repeat: true; duration: 1000 } elide: "ElideRight" text: "Brevity is the soul of wit, and tediousness the limbs and outward flourishes.\x9CBrevity is a great charm of eloquence.\x9CBe concise!\x9CSHHHHHHHHHHHHHHHHHHHHHHHHHHHH" diff --git a/tests/auto/declarative/visual/repeater/basic1.qml b/tests/auto/declarative/visual/repeater/basic1.qml index f6899e8..acb669c 100644 --- a/tests/auto/declarative/visual/repeater/basic1.qml +++ b/tests/auto/declarative/visual/repeater/basic1.qml @@ -4,7 +4,6 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page Row { Repeater { delegate: Rectangle { diff --git a/tests/auto/declarative/visual/repeater/basic2.qml b/tests/auto/declarative/visual/repeater/basic2.qml index 15a1e91..3323da5 100644 --- a/tests/auto/declarative/visual/repeater/basic2.qml +++ b/tests/auto/declarative/visual/repeater/basic2.qml @@ -4,9 +4,8 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page Component { - id: Delegate + id: delegate Rectangle { color: "red" width: 100 @@ -18,7 +17,7 @@ Rectangle { } Row { Repeater { - delegate: Delegate + delegate: delegate model: ListModel { ListElement { name: "January" diff --git a/tests/auto/declarative/visual/repeater/basic3.qml b/tests/auto/declarative/visual/repeater/basic3.qml index 4680534..cb57d49 100644 --- a/tests/auto/declarative/visual/repeater/basic3.qml +++ b/tests/auto/declarative/visual/repeater/basic3.qml @@ -4,9 +4,8 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page ListModel { - id: DataSource + id: dataSource ListElement { name: "January" } @@ -16,7 +15,7 @@ Rectangle { } Row { Repeater { - model: DataSource + model: dataSource delegate: Rectangle { color: "red" width: 100 diff --git a/tests/auto/declarative/visual/repeater/basic4.qml b/tests/auto/declarative/visual/repeater/basic4.qml index 6172493..f31de2c 100644 --- a/tests/auto/declarative/visual/repeater/basic4.qml +++ b/tests/auto/declarative/visual/repeater/basic4.qml @@ -4,9 +4,8 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page ListModel { - id: DataSource + id: dataSource ListElement { name: "January" } @@ -15,7 +14,7 @@ Rectangle { } } Component { - id: Delegate + id: delegate Rectangle { color: "red" width: 100 @@ -27,8 +26,8 @@ Rectangle { } Row { Repeater { - model: DataSource - delegate: Delegate + model: dataSource + delegate: delegate } } } diff --git a/tests/auto/declarative/visual/scriptAction/scriptAction.qml b/tests/auto/declarative/visual/scriptAction/scriptAction.qml index b1254e2..872701b 100644 --- a/tests/auto/declarative/visual/scriptAction/scriptAction.qml +++ b/tests/auto/declarative/visual/scriptAction/scriptAction.qml @@ -8,13 +8,13 @@ Rectangle { color: "red" } MouseRegion { - id: Clickable + id: clickable anchors.fill: parent } states: State { name: "state1" - when: Clickable.pressed + when: clickable.pressed PropertyChanges { target: myRect x: 50; y: 50 -- cgit v0.12 From 9db4032f60dd0992826de434fb6742448633211e Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Tue, 10 Nov 2009 17:27:17 +1000 Subject: Oops... --- src/gui/graphicsview/qgraphicsanchorlayout_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h index 2f68d73..3ef37f9 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h @@ -267,7 +267,7 @@ inline QString AnchorVertex::toString() const const AnchorVertexPair *vp = static_cast(this); return QString::fromAscii("(%1, %2)").arg(vp->m_first->toString()).arg(vp->m_second->toString()); } else if (!m_item) { - return "";//QString::fromAscii("NULL_%1").arg(int(this)); + return QString::fromAscii("NULL_%1").arg(int(this)); } QString edge; switch (m_edge) { -- cgit v0.12