Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r2 r561  
    33HEADERS += access/qftp.h \
    44           access/qhttp.h \
     5           access/qhttpnetworkheader_p.h \
     6           access/qhttpnetworkrequest_p.h \
     7           access/qhttpnetworkreply_p.h \
    58           access/qhttpnetworkconnection_p.h \
     9           access/qhttpnetworkconnectionchannel_p.h \
     10           access/qfilenetworkreply_p.h \
    611           access/qnetworkaccessmanager.h \
    712           access/qnetworkaccessmanager_p.h \
     
    1621           access/qnetworkcookie.h \
    1722           access/qnetworkcookie_p.h \
     23           access/qnetworkcookiejar.h \
     24           access/qnetworkcookiejar_p.h \
    1825           access/qnetworkrequest.h \
    1926           access/qnetworkrequest_p.h \
     
    2835SOURCES += access/qftp.cpp \
    2936           access/qhttp.cpp \
     37           access/qhttpnetworkheader.cpp \
     38           access/qhttpnetworkrequest.cpp \
     39           access/qhttpnetworkreply.cpp \
    3040           access/qhttpnetworkconnection.cpp \
     41           access/qhttpnetworkconnectionchannel.cpp \
     42           access/qfilenetworkreply.cpp \
    3143           access/qnetworkaccessmanager.cpp \
    3244           access/qnetworkaccesscache.cpp \
     
    3951           access/qnetworkaccesshttpbackend.cpp \
    4052           access/qnetworkcookie.cpp \
     53           access/qnetworkcookiejar.cpp \
    4154           access/qnetworkrequest.cpp \
    4255           access/qnetworkreply.cpp \
     
    4962   INCLUDEPATH += ../3rdparty/zlib
    5063} else:!contains(QT_CONFIG, no-zlib) {
    51    unix:LIBS += -lz
     64   unix:LIBS_PRIVATE += -lz
    5265#  win32:LIBS += libz.lib
    5366}
Note: See TracChangeset for help on using the changeset viewer.