summaryrefslogtreecommitdiffstats
path: root/tests/auto/qpixmap/tst_qpixmap.cpp
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2009-07-01 09:50:29 (GMT)
committerMarius Storm-Olsen <marius@trolltech.com>2009-07-01 09:51:25 (GMT)
commitd2f4a4b4f232b1c42cd89ac0b6bccb77dfe8e0db (patch)
tree946e359589d671f050c6a6a2f7f00b01e0ca6416 /tests/auto/qpixmap/tst_qpixmap.cpp
parentc447ce31632e25fdd40404cc96b6980aa0adcef8 (diff)
downloadQt-d2f4a4b4f232b1c42cd89ac0b6bccb77dfe8e0db.zip
Qt-d2f4a4b4f232b1c42cd89ac0b6bccb77dfe8e0db.tar.gz
Qt-d2f4a4b4f232b1c42cd89ac0b6bccb77dfe8e0db.tar.bz2
tests: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'tests/auto/qpixmap/tst_qpixmap.cpp')
-rw-r--r--tests/auto/qpixmap/tst_qpixmap.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index f52d44e..b3736ab 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -854,12 +854,7 @@ void tst_QPixmap::toWinHBITMAP()
BITMAP bitmap_info;
memset(&bitmap_info, 0, sizeof(BITMAP));
- int res;
- QT_WA({
- res = GetObjectW(bitmap, sizeof(BITMAP), &bitmap_info);
- } , {
- res = GetObjectA(bitmap, sizeof(BITMAP), &bitmap_info);
- });
+ int res = GetObject(bitmap, sizeof(BITMAP), &bitmap_info);
QVERIFY(res);
QCOMPARE(100, (int) bitmap_info.bmWidth);