Changeset 846 for trunk/src/corelib/tools/tools.pri

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/tools.pri (modified) (5 diffs)

trunk/src/corelib/tools/tools.pri

@@ -34 +34 @@
         tools/qsharedpointer_impl.h \
         tools/qset.h \
+
         tools/qsize.h \
         tools/qstack.h \
@@ -42 +43 @@
         tools/qtextboundaryfinder.h \
         tools/qtimeline.h \
+
         tools/qunicodetables_p.h \
         tools/qvarlengtharray.h \
@@ -56 +58 @@
         tools/qdatetime.cpp \
         tools/qeasingcurve.cpp \
+
         tools/qhash.cpp \
         tools/qline.cpp \
@@ -69 +72 @@
         tools/qshareddata.cpp \
         tools/qsharedpointer.cpp \
+
         tools/qsize.cpp \
         tools/qstring.cpp \
@@ -80 +84 @@
 symbian:SOURCES+=tools/qlocale_symbian.cpp
 
-#zlib support
-contains(QT_CONFIG, zlib) {
-   wince*: DEFINES += NO_ERRNO_H
-   INCLUDEPATH += ../3rdparty/zlib
-   SOURCES+= \
-        ../3rdparty/zlib/adler32.c \
-        ../3rdparty/zlib/compress.c \
-        ../3rdparty/zlib/crc32.c \
-        ../3rdparty/zlib/deflate.c \
-        ../3rdparty/zlib/gzio.c \
-        ../3rdparty/zlib/inffast.c \
-        ../3rdparty/zlib/inflate.c \
-        ../3rdparty/zlib/inftrees.c \
-        ../3rdparty/zlib/trees.c \
-        ../3rdparty/zlib/uncompr.c \
-        ../3rdparty/zlib/zutil.c
-} else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS_PRIVATE += -lz
-#  win32:LIBS += libz.lib
-}
+mac:SOURCES += tools/qelapsedtimer_mac.cpp
+else:symbian:SOURCES += tools/qelapsedtimer_symbian.cpp
+else:unix:SOURCES += tools/qelapsedtimer_unix.cpp
+else:win32:SOURCES += tools/qelapsedtimer_win.cpp
+else:SOURCES += tools/qelapsedtimer_generic.cpp
+
+contains(QT_CONFIG, zlib):include($$PWD/../../3rdparty/zlib.pri)
+else:include($$PWD/../../3rdparty/zlib_dependency.pri)
 
 DEFINES += HB_EXPORT=Q_CORE_EXPORT