diff options
6 files changed, 48 insertions, 32 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp index 6f953bc..d7d725b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp @@ -394,7 +394,7 @@ void QmlGraphicsBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem * p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth); const QmlGraphicsScaleGrid *border = d->getScaleGrid(); - QMargins margins(border->top(), border->left(), border->bottom(), border->right()); + QMargins margins(border->left(), border->top(), border->right(), border->bottom()); QTileRules rules((Qt::TileRule)d->horizontalTileMode, (Qt::TileRule)d->verticalTileMode); qDrawBorderPixmap(p, QRect(0, 0, (int)d->width, (int)d->height), margins, d->pix, d->pix.rect(), margins, rules); if (d->smooth) { diff --git a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp b/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp index f23c7d7..bcdfa2e 100644 --- a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp +++ b/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp @@ -112,12 +112,27 @@ void tst_qmlgraphicsborderimage::noSource() delete obj; } +void tst_qmlgraphicsborderimage::imageSource_data() +{ + QTest::addColumn<QString>("source"); + QTest::addColumn<bool>("remote"); + QTest::addColumn<QString>("error"); + + QTest::newRow("local") << SRCDIR "/data/colors.png" << false << ""; + QTest::newRow("local not found") << SRCDIR "/data/no-such-file.png" << false + << "Cannot open QUrl( \"file://" SRCDIR "/data/no-such-file.png\" ) "; + QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << ""; + QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true + << "Network error loading QUrl( \"" SERVER_ADDR "/no-such-file.png\" ) " + "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" "; +} + void tst_qmlgraphicsborderimage::imageSource() { QFETCH(QString, source); - QFETCH(bool, valid); + QFETCH(bool, remote); + QFETCH(QString, error); - bool remote = source.startsWith("http"); TestHTTPServer *server = 0; if (remote) { server = new TestHTTPServer(SERVER_PORT); @@ -125,6 +140,9 @@ void tst_qmlgraphicsborderimage::imageSource() server->serveDirectory(SRCDIR "/data"); } + if (!error.isEmpty()) + QTest::ignoreMessage(QtWarningMsg, error.toUtf8()); + QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\" }"; QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://")); QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create()); @@ -135,7 +153,7 @@ void tst_qmlgraphicsborderimage::imageSource() QCOMPARE(obj->source(), remote ? source : QUrl::fromLocalFile(source)); - if (valid) { + if (error.isEmpty()) { TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Ready); QCOMPARE(obj->width(), 120.); QCOMPARE(obj->height(), 120.); @@ -168,17 +186,6 @@ void tst_qmlgraphicsborderimage::clearSource() QCOMPARE(obj->height(), 0.); } -void tst_qmlgraphicsborderimage::imageSource_data() -{ - QTest::addColumn<QString>("source"); - QTest::addColumn<bool>("valid"); - - QTest::newRow("local") << SRCDIR "/data/colors.png" << true; - QTest::newRow("local not found") << SRCDIR "/data/no-such-file.png" << false; - QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true; - QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << false; -} - void tst_qmlgraphicsborderimage::resized() { QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }"; @@ -290,6 +297,9 @@ void tst_qmlgraphicsborderimage::sciSource_data() void tst_qmlgraphicsborderimage::invalidSciFile() { + QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Roun" + QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Repea" + QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/invalid.sci\"; width: 300; height: 300 }"; QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://")); QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create()); diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml b/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml index cf98dd9..3e08359 100644 --- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml +++ b/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml @@ -8,7 +8,7 @@ Flickable { id: row Repeater { model: 4 - Rectangle { width: 200; height: 300; color: dayColor } + Rectangle { width: 200; height: 300; color: "blue" } } } } diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml b/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml index 001bf2f..3ed173d 100644 --- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml +++ b/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml @@ -8,7 +8,7 @@ Flickable { id: column Repeater { model: 4 - Rectangle { width: 200; height: 300; color: dayColor } + Rectangle { width: 200; height: 300; color: "blue" } } } } diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml b/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml index 5a27869..1425d85 100644 --- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml +++ b/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml @@ -10,7 +10,7 @@ Flickable { id: column Repeater { model: 4 - Rectangle { width: 200; height: 300; color: dayColor } + Rectangle { width: 200; height: 300; color: "blue" } } } } diff --git a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp b/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp index 5ce5faf..784ad42 100644 --- a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp +++ b/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp @@ -106,11 +106,26 @@ void tst_qmlgraphicsimage::noSource() delete obj; } +void tst_qmlgraphicsimage::imageSource_data() +{ + QTest::addColumn<QString>("source"); + QTest::addColumn<bool>("remote"); + QTest::addColumn<QString>("error"); + + QTest::newRow("local") << SRCDIR "/data/colors.png" << false << ""; + QTest::newRow("local not found") << SRCDIR "/data/no-such-file.png" << false + << "Cannot open QUrl( \"file://" SRCDIR "/data/no-such-file.png\" ) "; + QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << ""; + QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true + << "Network error loading QUrl( \"" SERVER_ADDR "/no-such-file.png\" ) " + "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" "; +} + void tst_qmlgraphicsimage::imageSource() { QFETCH(QString, source); QFETCH(bool, remote); - QFETCH(bool, valid); + QFETCH(QString, error); TestHTTPServer server(SERVER_PORT); if (remote) { @@ -118,6 +133,9 @@ void tst_qmlgraphicsimage::imageSource() server.serveDirectory(SRCDIR "/data"); } + if (!error.isEmpty()) + QTest::ignoreMessage(QtWarningMsg, error.toUtf8()); + QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }"; QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://")); QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create()); @@ -128,7 +146,7 @@ void tst_qmlgraphicsimage::imageSource() QCOMPARE(obj->source(), remote ? source : QUrl::fromLocalFile(source)); - if (valid) { + if (error.isEmpty()) { TRY_WAIT(obj->status() == QmlGraphicsImage::Ready); QCOMPARE(obj->width(), 120.); QCOMPARE(obj->height(), 120.); @@ -162,18 +180,6 @@ void tst_qmlgraphicsimage::clearSource() QCOMPARE(obj->progress(), 0.0); } -void tst_qmlgraphicsimage::imageSource_data() -{ - QTest::addColumn<QString>("source"); - QTest::addColumn<bool>("remote"); - QTest::addColumn<bool>("valid"); - - QTest::newRow("local") << SRCDIR "/data/colors.png" << false << true; - QTest::newRow("local not found") << SRCDIR "/data/no-such-file.png" << false << false; - QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << true; - QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true << false; -} - void tst_qmlgraphicsimage::resized() { QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }"; |