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/kernel/kernel.pri

    r160 r561  
    2121           kernel/qnetworkinterface.cpp
    2222
    23 unix:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
     23symbian: SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_symbian.cpp
     24unix:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
    2425win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
    2526os2:SOURCES += kernel/qhostinfo_os2.cpp kernel/qnetworkinterface_os2.cpp
    2627
    27 mac:LIBS+= -framework SystemConfiguration
     28mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation
    2829mac:SOURCES += kernel/qnetworkproxy_mac.cpp
    2930else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
Note: See TracChangeset for help on using the changeset viewer.