diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-20 09:29:40 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-20 09:29:40 (GMT) |
| commit | 33afa6c1fbe230dec4eea435f9ad5d4141c128a8 (patch) | |
| tree | 2ace5c779c10288503b348a8d8bac8748dad0cae /tests/auto/qicon/tst_qicon.cpp | |
| parent | ee1e6222114028c2ff181f972e32f15011723b5f (diff) | |
| parent | 9f668a352df15404234ea30bc9bb0c1ef774c1b0 (diff) | |
| download | Qt-33afa6c1fbe230dec4eea435f9ad5d4141c128a8.zip Qt-33afa6c1fbe230dec4eea435f9ad5d4141c128a8.tar.gz Qt-33afa6c1fbe230dec4eea435f9ad5d4141c128a8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'tests/auto/qicon/tst_qicon.cpp')
| -rw-r--r-- | tests/auto/qicon/tst_qicon.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp index 7e515a5..4e9a880 100644 --- a/tests/auto/qicon/tst_qicon.cpp +++ b/tests/auto/qicon/tst_qicon.cpp @@ -186,10 +186,8 @@ void tst_QIcon::actualSize2() QFETCH(QSize, argument); QFETCH(QSize, result); -#if QT_VERSION >= 0x040200 QCOMPARE(icon.actualSize(argument), result); QCOMPARE(icon.pixmap(argument).size(), result); -#endif } void tst_QIcon::svgActualSize() |