diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-10-28 16:56:05 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-11-11 13:34:32 +0100 |
| commit | 8ce93376cd6aa1fac0eeacbd804bc211b0814c91 (patch) | |
| tree | c603ecdd01edc4e7815cbb98d3305a9d89e1937f /src/gui/opengl/qopenglframebufferobject.cpp | |
| parent | 18e4fd1dd1babe3b4178d8815594f4d3af87df19 (diff) | |
OS X and iOS: Search for openssl libs in .app/Contents/Frameworks
This allows apps to ship their own openssl libraries inside the
application bundle.
The change consists of two parts: First, adding
<bundle>/Contents/Frameworks
to the alternative search paths. Second, disabling the preemtive
check for libssl.dylib, libcrypto.dylib in the system paths:
The system's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib
will still be picked up as a fallback in the alternative search
paths, but only after .app/Contents/Frameworks have been inspected.
[ChangeLog][QtNetwork][QSsl] On OS X and iOS, openssl dylib's are
picked up from the 'Frameworks' directory of the app bundle.
Change-Id: I982930f4a6cf5e0114c04ecbc87f27e54ba8bb88
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'src/gui/opengl/qopenglframebufferobject.cpp')
0 files changed, 0 insertions, 0 deletions