diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 13:23:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 14:24:55 +0200 |
| commit | dd90af122154af8ba8cba16c8760c3d2a1d0fcab (patch) | |
| tree | 08dc64d9960346c4b27f42c7e58ef9d8885ac760 /src/corelib/corelib.pro | |
| parent | b24396b925c78a59ef4a59d69a6b2633887aaf2f (diff) | |
| parent | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
mkspecs/common/mac.conf
mkspecs/features/configure_base.prf
mkspecs/features/configure.prf
mkspecs/macx-clang-32/qmake.conf
mkspecs/macx-clang/qmake.conf
mkspecs/macx-ios-clang/qmake.conf
src/network/ssl/qsslsocket_openssl_symbols_p.h
Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index ccf9aaa612..1db814180b 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -27,8 +27,9 @@ ANDROID_PERMISSIONS = \ android.permission.WRITE_EXTERNAL_STORAGE # QtCore can't be compiled with -Wl,-no-undefined because it uses the "environ" -# variable and on FreeBSD, this variable is in the final executable itself -freebsd: QMAKE_LFLAGS_NOUNDEF = +# variable and on FreeBSD and OpenBSD, this variable is in the final executable itself. +# OpenBSD 6.0 will include environ in libc. +freebsd|openbsd: QMAKE_LFLAGS_NOUNDEF = load(qfeatures) |