diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-31 04:02:08 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-31 04:02:08 (GMT) |
commit | a0b413c14b94c1ac3f394f22076fd12c370d07f3 (patch) | |
tree | 6db2374a2d956c5922c3de0e9ad5bdc5d04b30d4 /tests/auto/qpen | |
parent | a4d3ffe03359e415f4a4a5740eb19bbb9dfddc0b (diff) | |
parent | 33b1332d1b8593f488cf5f926315a6df68eee7df (diff) | |
download | Qt-a0b413c14b94c1ac3f394f22076fd12c370d07f3.zip Qt-a0b413c14b94c1ac3f394f22076fd12c370d07f3.tar.gz Qt-a0b413c14b94c1ac3f394f22076fd12c370d07f3.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/qpen')
-rw-r--r-- | tests/auto/qpen/tst_qpen.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qpen/tst_qpen.cpp b/tests/auto/qpen/tst_qpen.cpp index 149f462..b0c2cad 100644 --- a/tests/auto/qpen/tst_qpen.cpp +++ b/tests/auto/qpen/tst_qpen.cpp @@ -213,6 +213,5 @@ void tst_QPen::stream() QCOMPARE(pen, cmp); } - QTEST_APPLESS_MAIN(tst_QPen) #include "tst_qpen.moc" |