diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-12-09 10:13:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 10:13:48 +0100 |
| commit | 25b390256bf2a699231a165e49f4100262ed29ac (patch) | |
| tree | 4c3c3cc8dbbe1a523edb26aefd29c22da8732e1f /configure | |
| parent | bcf346a76659f896a25f31aa44f64ba5f28ba8e1 (diff) | |
| parent | f6dbdd9c16166f345fd5743886229192c97c2c4f (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -687,6 +687,7 @@ CFG_MIPS_DSP=auto CFG_MIPS_DSPR2=auto CFG_CLOCK_GETTIME=auto CFG_CLOCK_MONOTONIC=auto +CFG_POSIX_FALLOCATE=auto CFG_MREMAP=auto CFG_GETADDRINFO=auto CFG_IPV6IFNAME=auto @@ -5144,6 +5145,9 @@ if [ "$CFG_XCB" != "no" ]; then if [ "$CFG_XCB_XLIB" != "no" ]; then if compileTest qpa/xcb-xlib "xcb-xlib" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then QT_CONFIG="$QT_CONFIG xcb-xlib" + CFG_XCB_XLIB=yes + else + CFG_XCB_XLIB=no fi fi @@ -5458,6 +5462,15 @@ elif [ "$CFG_CLOCK_GETTIME" = "no" ]; then CFG_CLOCK_MONOTONIC=no fi +# detect posix_fallocate +if [ "$CFG_POSIX_FALLOCATE" = "auto" ]; then + if compileTest unix/posix_fallocate "posix_fallocate"; then + CFG_POSIX_FALLOCATE=yes + else + CFG_POSIX_FALLOCATE=no + fi +fi + # detect mremap if [ "$CFG_MREMAP" = "auto" ]; then if compileTest unix/mremap "mremap"; then @@ -5782,6 +5795,9 @@ fi if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then QT_CONFIG="$QT_CONFIG clock-monotonic" fi +if [ "$CFG_POSIX_FALLOCATE" = "yes" ]; then + QT_CONFIG="$QT_CONFIG posix_fallocate" +fi if [ "$CFG_MREMAP" = "yes" ]; then QT_CONFIG="$QT_CONFIG mremap" fi @@ -6261,6 +6277,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB" [ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK" [ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC" +[ "$CFG_POSIX_FALLOCATE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_POSIX_FALLOCATE" [ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP" [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO" [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME" |