diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-30 10:58:16 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-30 10:58:16 (GMT) |
| commit | 116683d4284646d91013e6f3a8d940c8855fbca3 (patch) | |
| tree | 93bdc46bec4f274ef28939e1840cdfc39bcfcc05 /tests/auto/qstyle | |
| parent | 5a54b2c4c448ea22adb56bc191303abca34f230b (diff) | |
| parent | 238a618b5482e0471f46ed71362492be9c4df4a6 (diff) | |
| download | Qt-116683d4284646d91013e6f3a8d940c8855fbca3.zip Qt-116683d4284646d91013e6f3a8d940c8855fbca3.tar.gz Qt-116683d4284646d91013e6f3a8d940c8855fbca3.tar.bz2 | |
Merge branch '4.5'
Diffstat (limited to 'tests/auto/qstyle')
| -rw-r--r-- | tests/auto/qstyle/qstyle.pro | 3 | ||||
| -rw-r--r-- | tests/auto/qstyle/tst_qstyle.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro index 71ee2e6..ba0908a 100644 --- a/tests/auto/qstyle/qstyle.pro +++ b/tests/auto/qstyle/qstyle.pro @@ -2,9 +2,12 @@ load(qttest_p4) SOURCES += tst_qstyle.cpp wince*: { + DEFINES += SRCDIR=\\\".\\\" addPixmap.sources = task_25863.png addPixmap.path = . DEPLOYMENT += addPixmap +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" } diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index 667d459..4009e66 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -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(); |