diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 15:06:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 16:35:42 +0200 |
| commit | b2603b76655ac819e43c063bb6f16bc95f358083 (patch) | |
| tree | 0fbe2c367ebfffdb70e9e3f21a7cf408bafd9626 /configure | |
| parent | 99b94aadf875c822afb6c2580e43355ac392ac92 (diff) | |
| parent | 756266d01560157b7274e466b9ffc1b0e2ef9a1f (diff) | |
Merge remote-tracking branch 'origin/5.5' into HEAD
Conflicts:
src/plugins/platforms/windows/qwindowsopengltester.cpp
Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -682,6 +682,9 @@ CFG_XCB=auto CFG_XCB_XLIB=auto CFG_XCB_GLX=no CFG_EGLFS=auto +CFG_EGLFS_BRCM=no +CFG_EGLFS_MALI=no +CFG_EGLFS_VIV=no CFG_DIRECTFB=auto CFG_LINUXFB=auto CFG_KMS=auto @@ -2697,7 +2700,7 @@ MacOS/iOS options: link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. - -secure-transport .. Use SecureTransport instead of OpenSSL (requires -no-openssl) + -securetransport ... Use SecureTransport instead of OpenSSL (requires -no-openssl) -sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. The argument should be one of the available SDKs as listed by 'xcodebuild -showsdks'. @@ -2842,7 +2845,7 @@ if [ -z "$PLATFORM" ]; then Linux:*) PLATFORM=linux-g++ PLATFORM_NOTES=" - - Also available for Linux: linux-kcc linux-icc linux-cxx + - Also available for Linux: linux-clang linux-kcc linux-icc linux-cxx " ;; SunOS:5*) @@ -4236,7 +4239,7 @@ compileTestWithPkgConfig() libdir_mod=`echo $libdir_raw | sed -e 's,^-L,,g' -e 's, -L, ,g'` has_used_pkg_config="yes" fi - if compileTest $configtest $configtest_name $libdir_raw $incdir_raw $libs $cflags "$@"; then + if compileTest $configtest "$configtest_name" $libdir_raw $incdir_raw $libs $cflags "$@"; then if [ "$has_used_pkg_config" = "yes" ] && [ -n "$qmake_postfix" ]; then QMakeVar set QMAKE_INCDIR_$qmake_postfix "`shellArgumentListToQMakeList $incdir_mod`" QMakeVar set QMAKE_LIBDIR_$qmake_postfix "`shellArgumentListToQMakeList $libdir_mod`" |