diff options
| author | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
| commit | de01a7e1e827ee7df035e0b32166db2263712e63 (patch) | |
| tree | 3a5cda42d360c63c027afd80eb2e6715faa72aaa /tests/auto/qfile/test | |
| parent | 4c06cd950d27ba10d2288d508cbaef4e44abee91 (diff) | |
| parent | 44d992ca150d9448cb7b9114b2bc489b441c7b76 (diff) | |
| download | Qt-de01a7e1e827ee7df035e0b32166db2263712e63.zip Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.gz Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
Diffstat (limited to 'tests/auto/qfile/test')
| -rw-r--r-- | tests/auto/qfile/test/test.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qfile/test/test.pro b/tests/auto/qfile/test/test.pro index b51eff6..80102f0 100644 --- a/tests/auto/qfile/test/test.pro +++ b/tests/auto/qfile/test/test.pro @@ -23,7 +23,7 @@ wince*:{ DEFINES += SRCDIR=\\\"$$PWD/../\\\" } -RESOURCES += ../qfile.qrc ../rename-fallback.qrc +RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc TARGET = ../tst_qfile |