diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-07 13:00:14 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-07 13:00:14 (GMT) |
| commit | f5392a4290e5f7ae2bdf268c1fa8c037e776fdae (patch) | |
| tree | d3cc657639b8784dbc22eae2bae5e58e62db7a2f /tests/auto/qstyle/tst_qstyle.cpp | |
| parent | 0044b3c968f5023f502e3574c96d4e4df0de865d (diff) | |
| parent | 2a834d39a69430058df3916392afab064ca941ee (diff) | |
| download | Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.zip Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.tar.gz Qt-f5392a4290e5f7ae2bdf268c1fa8c037e776fdae.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/network/socket/qlocalsocket.cpp
Diffstat (limited to 'tests/auto/qstyle/tst_qstyle.cpp')
| -rw-r--r-- | tests/auto/qstyle/tst_qstyle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index 667d459..2cb5080 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -91,7 +91,7 @@ #include <windows.h> static bool qt_wince_is_smartphone() { - TCHAR tszPlatform[64]; + wchar_t tszPlatform[64]; if (SystemParametersInfo(SPI_GETPLATFORMTYPE, sizeof(tszPlatform)/sizeof(*tszPlatform),tszPlatform,0)) if (0 == _tcsicmp(reinterpret_cast<const wchar_t *> (QString::fromLatin1("Smartphone").utf16()), tszPlatform)) @@ -257,7 +257,8 @@ void tst_QStyle::drawItemPixmap() { testWidget->resize(300, 300); testWidget->show(); - QPixmap p("task_25863.png", "PNG"); + + QPixmap p(QString(SRCDIR) + "/task_25863.png", "PNG"); QPixmap actualPix = QPixmap::grabWidget(testWidget); QVERIFY(pixmapsAreEqual(&actualPix,&p)); testWidget->hide(); |