summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/declarative/pics/rect-smooth.pngbin32162 -> 24241 bytes
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle.cpp1
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp4
3 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/declarative/pics/rect-smooth.png b/doc/src/declarative/pics/rect-smooth.png
index abbb0a9..7ffd8ab 100644
--- a/doc/src/declarative/pics/rect-smooth.png
+++ b/doc/src/declarative/pics/rect-smooth.png
Binary files differ
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 3f7548f..54c8ab2 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -464,6 +464,7 @@ void QDeclarativeRectangle::drawRect(QPainter &p)
filtering at the beginning of the animation and reenable it at the conclusion.
\image rect-smooth.png
+ On this image, smooth is turned off on the top half and on on the bottom half.
*/
QRectF QDeclarativeRectangle::boundingRect() const
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 6d7e578..25cd1ee 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -90,7 +90,7 @@ to have them tested by the examples() test.
void tst_examples::namingConvention(const QDir &d)
{
for (int ii = 0; ii < excludedDirs.count(); ++ii) {
- QString s = QDir::toNativeSeparators(excludedDirs.at(ii));
+ QString s = excludedDirs.at(ii);
if (d.absolutePath().endsWith(s))
return;
}
@@ -131,7 +131,7 @@ void tst_examples::namingConvention()
QStringList tst_examples::findQmlFiles(const QDir &d)
{
for (int ii = 0; ii < excludedDirs.count(); ++ii) {
- QString s = QDir::toNativeSeparators(excludedDirs.at(ii));
+ QString s = excludedDirs.at(ii);
if (d.absolutePath().endsWith(s))
return QStringList();
}