Changeset 846 for trunk/src/tools/bootstrap/bootstrap.pro
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/tools/bootstrap/bootstrap.pro
r561 r846 88 88 89 89 win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \ 90 ../../corelib/io/qfsfileengine_iterator_win.cpp 90 ../../corelib/io/qfsfileengine_iterator_win.cpp \ 91 ../../corelib/plugin/qsystemlibrary.cpp \ 91 92 92 93 os2:SOURCES += ../../corelib/io/qfsfileengine_os2.cpp \ … … 99 100 } 100 101 101 contains(QT_CONFIG, zlib) { 102 INCLUDEPATH += ../../3rdparty/zlib 103 SOURCES+= \ 104 ../3rdparty/zlib/adler32.c \ 105 ../3rdparty/zlib/compress.c \ 106 ../3rdparty/zlib/crc32.c \ 107 ../3rdparty/zlib/deflate.c \ 108 ../3rdparty/zlib/gzio.c \ 109 ../3rdparty/zlib/inffast.c \ 110 ../3rdparty/zlib/inflate.c \ 111 ../3rdparty/zlib/inftrees.c \ 112 ../3rdparty/zlib/trees.c \ 113 ../3rdparty/zlib/uncompr.c \ 114 ../3rdparty/zlib/zutil.c 115 } 102 if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) 103 else:include(../../3rdparty/zlib_dependency.pri) 116 104 117 105 lib.CONFIG = dummy_install 118 106 INSTALLS += lib 107 108 109 110 111 112 113 114 115 116
Note:
See TracChangeset
for help on using the changeset viewer.