diff options
| author | axis <qt-info@nokia.com> | 2009-07-07 08:50:33 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-07-07 08:50:33 (GMT) |
| commit | 1e192edd72789241e7397dcbc5ee326b2aed5790 (patch) | |
| tree | 430961aed08cdfa25717bde84c3f74a2f75673fe /tests/auto/qstyle/qstyle.pro | |
| parent | 2aac0c8b71fffd7c0335c1429bd1f2405adaa5e7 (diff) | |
| parent | 343e8b7e75c98a4fd1b692a230de8d1132988705 (diff) | |
| download | Qt-1e192edd72789241e7397dcbc5ee326b2aed5790.zip Qt-1e192edd72789241e7397dcbc5ee326b2aed5790.tar.gz Qt-1e192edd72789241e7397dcbc5ee326b2aed5790.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
src/network/access/qhttpnetworkconnection_p.h
tests/auto/qstyle/qstyle.pro
tests/auto/qstyle/tst_qstyle.cpp
tools/configure/configureapp.cpp
configure.exe will be recompiled in next commit. Took ours.
Diffstat (limited to 'tests/auto/qstyle/qstyle.pro')
| -rw-r--r-- | tests/auto/qstyle/qstyle.pro | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro index f9fed69..8163f26 100644 --- a/tests/auto/qstyle/qstyle.pro +++ b/tests/auto/qstyle/qstyle.pro @@ -2,12 +2,11 @@ load(qttest_p4) TARGET.EPOCHEAPSIZE = 0x200000 0x800000 SOURCES += tst_qstyle.cpp -wince*: { - addPixmap.sources = task_25863.png - addPixmap.path = . - DEPLOYMENT += addPixmap -} else:symbian* { +wince*|symbian*: { + DEFINES += SRCDIR=\\\".\\\" addPixmap.sources = task_25863.png addPixmap.path = . DEPLOYMENT += addPixmap +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" } |