Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
57 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/network/access/access.pri

    r561 r846  
    11# Qt network access module
    22
    3 HEADERS += access/qftp.h \
    4            access/qhttp.h \
    5            access/qhttpnetworkheader_p.h \
    6            access/qhttpnetworkrequest_p.h \
    7            access/qhttpnetworkreply_p.h \
    8            access/qhttpnetworkconnection_p.h \
    9            access/qhttpnetworkconnectionchannel_p.h \
    10            access/qfilenetworkreply_p.h \
    11            access/qnetworkaccessmanager.h \
    12            access/qnetworkaccessmanager_p.h \
    13            access/qnetworkaccesscache_p.h \
    14            access/qnetworkaccessbackend_p.h \
    15            access/qnetworkaccessdatabackend_p.h \
    16            access/qnetworkaccessdebugpipebackend_p.h \
    17            access/qnetworkaccesshttpbackend_p.h \
    18            access/qnetworkaccessfilebackend_p.h \
    19            access/qnetworkaccesscachebackend_p.h \
    20            access/qnetworkaccessftpbackend_p.h \
    21            access/qnetworkcookie.h \
    22            access/qnetworkcookie_p.h \
    23            access/qnetworkcookiejar.h \
    24            access/qnetworkcookiejar_p.h \
    25            access/qnetworkrequest.h \
    26            access/qnetworkrequest_p.h \
    27            access/qnetworkreply.h \
    28            access/qnetworkreply_p.h \
    29            access/qnetworkreplyimpl_p.h \
    30            access/qabstractnetworkcache_p.h \
    31            access/qabstractnetworkcache.h \
    32            access/qnetworkdiskcache_p.h \
    33            access/qnetworkdiskcache.h
     3HEADERS += \
     4    access/qftp.h \
     5    access/qhttp.h \
     6    access/qhttpnetworkheader_p.h \
     7    access/qhttpnetworkrequest_p.h \
     8    access/qhttpnetworkreply_p.h \
     9    access/qhttpnetworkconnection_p.h \
     10    access/qhttpnetworkconnectionchannel_p.h \
     11    access/qfilenetworkreply_p.h \
     12    access/qnetworkaccessmanager.h \
     13    access/qnetworkaccessmanager_p.h \
     14    access/qnetworkaccesscache_p.h \
     15    access/qnetworkaccessbackend_p.h \
     16    access/qnetworkaccessdatabackend_p.h \
     17    access/qnetworkaccessdebugpipebackend_p.h \
     18    access/qnetworkaccesshttpbackend_p.h \
     19    access/qnetworkaccessfilebackend_p.h \
     20    access/qnetworkaccesscachebackend_p.h \
     21    access/qnetworkaccessftpbackend_p.h \
     22    access/qnetworkcookie.h \
     23    access/qnetworkcookie_p.h \
     24    access/qnetworkcookiejar.h \
     25    access/qnetworkcookiejar_p.h \
     26    access/qnetworkcookiejartlds_p.h \
     27    access/qnetworkrequest.h \
     28    access/qnetworkrequest_p.h \
     29    access/qnetworkreply.h \
     30    access/qnetworkreply_p.h \
     31    access/qnetworkreplyimpl_p.h \
     32    access/qabstractnetworkcache_p.h \
     33    access/qabstractnetworkcache.h \
     34    access/qnetworkdiskcache_p.h \
     35    access/qnetworkdiskcache.h
    3436
    35 SOURCES += access/qftp.cpp \
    36            access/qhttp.cpp \
    37            access/qhttpnetworkheader.cpp \
    38            access/qhttpnetworkrequest.cpp \
    39            access/qhttpnetworkreply.cpp \
    40            access/qhttpnetworkconnection.cpp \
    41            access/qhttpnetworkconnectionchannel.cpp \
    42            access/qfilenetworkreply.cpp \
    43            access/qnetworkaccessmanager.cpp \
    44            access/qnetworkaccesscache.cpp \
    45            access/qnetworkaccessbackend.cpp \
    46            access/qnetworkaccessdatabackend.cpp \
    47            access/qnetworkaccessdebugpipebackend.cpp \
    48            access/qnetworkaccessfilebackend.cpp \
    49            access/qnetworkaccesscachebackend.cpp \
    50            access/qnetworkaccessftpbackend.cpp \
    51            access/qnetworkaccesshttpbackend.cpp \
    52            access/qnetworkcookie.cpp \
    53            access/qnetworkcookiejar.cpp \
    54            access/qnetworkrequest.cpp \
    55            access/qnetworkreply.cpp \
    56            access/qnetworkreplyimpl.cpp \
    57            access/qabstractnetworkcache.cpp \
    58            access/qnetworkdiskcache.cpp
     37SOURCES += \
     38    access/qftp.cpp \
     39    access/qhttp.cpp \
     40    access/qhttpnetworkheader.cpp \
     41    access/qhttpnetworkrequest.cpp \
     42    access/qhttpnetworkreply.cpp \
     43    access/qhttpnetworkconnection.cpp \
     44    access/qhttpnetworkconnectionchannel.cpp \
     45    access/qfilenetworkreply.cpp \
     46    access/qnetworkaccessmanager.cpp \
     47    access/qnetworkaccesscache.cpp \
     48    access/qnetworkaccessbackend.cpp \
     49    access/qnetworkaccessdatabackend.cpp \
     50    access/qnetworkaccessdebugpipebackend.cpp \
     51    access/qnetworkaccessfilebackend.cpp \
     52    access/qnetworkaccesscachebackend.cpp \
     53    access/qnetworkaccessftpbackend.cpp \
     54    access/qnetworkaccesshttpbackend.cpp \
     55    access/qnetworkcookie.cpp \
     56    access/qnetworkcookiejar.cpp \
     57    access/qnetworkrequest.cpp \
     58    access/qnetworkreply.cpp \
     59    access/qnetworkreplyimpl.cpp \
     60    access/qabstractnetworkcache.cpp \
     61    access/qnetworkdiskcache.cpp
    5962
    60 #zlib support
    61 contains(QT_CONFIG, zlib) {
    62    INCLUDEPATH += ../3rdparty/zlib
    63 } else:!contains(QT_CONFIG, no-zlib) {
    64    unix:LIBS_PRIVATE += -lz
    65 #  win32:LIBS += libz.lib
    66 }
     63include($$PWD/../../3rdparty/zlib_dependency.pri)