diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-01-16 08:59:26 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 01:54:07 (GMT) |
| commit | 68f2155cd27f669559dd0f877156d81deda8bf73 (patch) | |
| tree | d5283fce766a204d21bfe596f738c7e7249ff553 /src/network/kernel | |
| parent | f13d0078d9f829cde2cd5b8b9eac40635a883ec6 (diff) | |
| download | Qt-68f2155cd27f669559dd0f877156d81deda8bf73.zip Qt-68f2155cd27f669559dd0f877156d81deda8bf73.tar.gz Qt-68f2155cd27f669559dd0f877156d81deda8bf73.tar.bz2 | |
Fix for coreservices, it should be part of QPA tests
Since the coreservices test should be part of the QPA ones after all,
this reverts d317182e and fixes the original problem correctly by
checking if qpa is on before testing for coreservices
Change-Id: I476f56924ff2d9bbc2f290563aaff9528fe72766
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/kernel.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index e5d33bb..9238a68 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -26,7 +26,8 @@ win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp integrity:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation -mac:contains(QT_CONFIG, coreservices) SOURCES += kernel/qnetworkproxy_mac.cpp +qpa:contains(QT_CONFIG, coreservices):SOURCES += kernel/qnetworkproxy_mac.cpp +else:!qpa:mac:SOURCES += kernel/qnetworkproxy_mac.cpp else:win32:SOURCES += kernel/qnetworkproxy_win.cpp else:symbian:SOURCES += kernel/qnetworkproxy_symbian.cpp else:SOURCES += kernel/qnetworkproxy_generic.cpp |