diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-12 07:53:03 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-12 07:53:03 (GMT) |
| commit | 52d45bd5a6a1a17e76fba91d13c0ab0df807725f (patch) | |
| tree | 157244015aa7c0b73fcaaa506f1838fb4cf342df | |
| parent | ee958684bd1273a5140e1f6d1264bf8bb7d62ef1 (diff) | |
| parent | 94c9d486f266a4c99e389e900c9e157c077b7c7e (diff) | |
| download | Qt-52d45bd5a6a1a17e76fba91d13c0ab0df807725f.zip Qt-52d45bd5a6a1a17e76fba91d13c0ab0df807725f.tar.gz Qt-52d45bd5a6a1a17e76fba91d13c0ab0df807725f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | doc/src/declarative/pics/rect-smooth.png | bin | 32162 -> 24241 bytes | |||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativerectangle.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 4 |
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 Binary files differindex abbb0a9..7ffd8ab 100644 --- a/doc/src/declarative/pics/rect-smooth.png +++ b/doc/src/declarative/pics/rect-smooth.png 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(); } |
