diff options
| author | Peter Hartmann <phartmann@rim.com> | 2012-09-19 11:46:02 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-19 18:36:37 (GMT) |
| commit | 77c7ff8550e99e3ed27a9c67d689e681e1067180 (patch) | |
| tree | 43afdaa420a145f9895947d6c609a54a87d98907 | |
| parent | d41dc3e101a694dec98d7bbb582d428d209e5401 (diff) | |
| download | Qt-77c7ff8550e99e3ed27a9c67d689e681e1067180.zip Qt-77c7ff8550e99e3ed27a9c67d689e681e1067180.tar.gz Qt-77c7ff8550e99e3ed27a9c67d689e681e1067180.tar.bz2 | |
Fix build for platforms that use QPA other than IOS
For instance on Blackberry this would try to include Mac libraries as
well.
In Qt 5 this is still working.
Change-Id: Iae9d3b7e1b988ac8932c58deabfeb249cd2cfc2e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | src/network/kernel/kernel.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index ec0467d..a662246 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -20,7 +20,7 @@ include(statemachine/statemachine.pri) include(xml/xml.pri) !qpa:mac|darwin:LIBS_PRIVATE += -framework ApplicationServices -qpa { +qpa:mac { !ios { LIBS_PRIVATE += -framework CoreServices -framework Security } diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index 9d75172..58fc5d6 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -26,7 +26,7 @@ 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 -qpa:!ios:SOURCES += kernel/qnetworkproxy_mac.cpp +qpa:mac:!ios: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 |