diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-07-06 05:46:31 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-07-06 05:46:31 (GMT) |
| commit | 49dccb31d1e31c4d538f65c62e20268fc2496a6e (patch) | |
| tree | a6c930fc8e0056a505475ab24be5233ee8ca859a /src/3rdparty/zlib.pri | |
| parent | c9d487b6ed3ac9bb666c2a1fe08252f3c6dcb455 (diff) | |
| parent | 7369eaf32dd45b6fb4e72c34bee2c9a44c62a5b4 (diff) | |
| download | Qt-49dccb31d1e31c4d538f65c62e20268fc2496a6e.zip Qt-49dccb31d1e31c4d538f65c62e20268fc2496a6e.tar.gz Qt-49dccb31d1e31c4d538f65c62e20268fc2496a6e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/declarative/extending.qdoc
Diffstat (limited to 'src/3rdparty/zlib.pri')
| -rw-r--r-- | src/3rdparty/zlib.pri | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri new file mode 100644 index 0000000..bae3221 --- /dev/null +++ b/src/3rdparty/zlib.pri @@ -0,0 +1,14 @@ +wince*: DEFINES += NO_ERRNO_H +INCLUDEPATH += $$PWD/zlib +SOURCES+= \ + $$PWD/zlib/adler32.c \ + $$PWD/zlib/compress.c \ + $$PWD/zlib/crc32.c \ + $$PWD/zlib/deflate.c \ + $$PWD/zlib/gzio.c \ + $$PWD/zlib/inffast.c \ + $$PWD/zlib/inflate.c \ + $$PWD/zlib/inftrees.c \ + $$PWD/zlib/trees.c \ + $$PWD/zlib/uncompr.c \ + $$PWD/zlib/zutil.c |