diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-10-12 13:53:46 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-10-12 13:53:46 (GMT) |
| commit | 267bee03092c316860ad9f4025c2f527c82b10d7 (patch) | |
| tree | 7722009b7ef351caa926220e4048591dbd7ed374 /tests/arthur | |
| parent | 76e1b6a93a36080e39c3d1e7cb1e754aa0131999 (diff) | |
| parent | ac19a3409253f5f74984624b99268212ba74c086 (diff) | |
| download | Qt-267bee03092c316860ad9f4025c2f527c82b10d7.zip Qt-267bee03092c316860ad9f4025c2f527c82b10d7.tar.gz Qt-267bee03092c316860ad9f4025c2f527c82b10d7.tar.bz2 | |
Merge branch 'master' of ../qt-stg2-master into lancelot
Diffstat (limited to 'tests/arthur')
| -rw-r--r-- | tests/arthur/common/paintcommands.cpp | 2 | ||||
| -rw-r--r-- | tests/arthur/lance/lance.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp index a86b30a..dc1b008 100644 --- a/tests/arthur/common/paintcommands.cpp +++ b/tests/arthur/common/paintcommands.cpp @@ -734,7 +734,7 @@ void PaintCommands::runCommands() QPainter pt(&pm); pt.fillRect(0, 0, 10, 10, QColor::fromRgba(0xffdfdfdf)); pt.fillRect(10, 10, 10, 10, QColor::fromRgba(0xffdfdfdf)); - + pt.end(); m_painter->drawTiledPixmap(0, 0, width, height, pm); } else { m_painter->fillRect(0, 0, width, height, Qt::white); diff --git a/tests/arthur/lance/lance.pro b/tests/arthur/lance/lance.pro index 3692f21..56b7f25 100644 --- a/tests/arthur/lance/lance.pro +++ b/tests/arthur/lance/lance.pro @@ -13,7 +13,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, o contains(QT_CONFIG, qt3support):QT += qt3support symbian*: { - testData.sources = $$QT_BUILD_TREE/tests/arthur/data/qps + testData.files = $$QT_BUILD_TREE/tests/arthur/data/qps testData.path = . DEPLOYMENT += testData } |