diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
commit | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (patch) | |
tree | c3ed9aee6cabd46e5e8615b3815b92d32857c4da /configure | |
parent | 26ece94a68fb5ae680c5639716b06c4e1ae979a8 (diff) | |
parent | 7b2fb038ae4b8b9231ae989ad309b6eca107a858 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qiodevice_p.h
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qsimd.cpp
src/gui/kernel/qguiapplication.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -128,8 +128,8 @@ shellQuoteLines() makeabs() { - local FILE=$1 - local RES=$FILE + local FILE="$1" + local RES="$FILE" if [ -z "${FILE##/*}" ]; then true elif [ "$OSTYPE" = "msys" -a -z "${FILE##[a-zA-Z]:[/\\]*}" ]; then @@ -2626,7 +2626,9 @@ Additional options: -l <string> ........ Add an explicit library. -no-rpath .......... Do not use the library install path as a runtime - library path. + library path. On Apple platforms, this implies using + absolute install names (based in -libdir) for dynamic + libraries and frameworks. + -rpath ............. Link Qt libraries and executables using the library install path as a runtime library path. Equivalent to -R install_libpath |