diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 38 |
1 files changed, 24 insertions, 14 deletions
@@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ## Contact: http://www.qt-project.org/legal ## ## This file is the build configuration utility of the Qt Toolkit. @@ -831,6 +831,7 @@ CFG_AVX=auto CFG_AVX2=auto CFG_REDUCE_RELOCATIONS=auto CFG_ACCESSIBILITY=auto +CFG_ACCESSIBILITY_ATSPI_BRIDGE=no # will be enabled depending on dbus and accessibility being enabled CFG_IWMMXT=no CFG_NEON=auto CFG_MIPS_DSP=auto @@ -2623,6 +2624,11 @@ else CFG_FRAMEWORK=no fi +# disable GTK style support auto-detection on Mac +if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then + CFG_QGTKSTYLE=no +fi + QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` TEST_COMPILER=$QMAKE_CONF_COMPILER @@ -2739,6 +2745,7 @@ libdirs=`echo "$gccout" | sed -n -e 's/^LIBRARY_PATH=\(.*\)/\1/p'` DEFAULT_LIBDIRS=`IFS=:; for i in $libdirs; do test -d "$i" && cd "$i" && pwd; done | sort -u` DEFAULT_INCDIRS=`echo "$gccout" | awk ' /^End of search/ { yup=0 } +/ \(framework directory\)$/ { next } yup { print substr($0, 2) } /^\#include </ { yup=1 } ' | sort -u` @@ -3087,6 +3094,10 @@ Configure options: + -largefile ......... Enables Qt to access files larger than 4 GB. -no-accessibility .. Do not compile Accessibility support. + Disabling accessibility is not recommended, as it will break QStyle + and may break other internal parts of Qt. + With this switch you create a source incompatible version of Qt, + which is unsupported. + -accessibility ..... Compile Accessibility support. -no-sql-<driver> ... Disable SQL <driver> entirely. @@ -4943,20 +4954,19 @@ if [ "$CFG_KMS" = "yes" ]; then fi # Detect accessibility support -if [ "$CFG_ACCESSIBILITY" != "no" ]; then - if [ "$CFG_XCB" = "no" ]; then - CFG_ACCESSIBILITY=yes - else - # linux/xcb accessibility needs dbus - if [ "$CFG_DBUS" != "no" ] && [ -n "$PKG_CONFIG" ]; then - CFG_ACCESSIBILITY=yes +if [ "$CFG_ACCESSIBILITY" = "no" ]; then + echo >&2 "Warning: Disabling Accessibility. This version of Qt is unsupported." +else + CFG_ACCESSIBILITY=yes + + # linux/xcb accessibility bridge needs dbus + if [ "$CFG_XCB" != "no" ]; then + if [ "$CFG_DBUS" != "no" ]; then + CFG_ACCESSIBILITY_ATSPI_BRIDGE=yes + QT_CONFIG="$QT_CONFIG accessibility-atspi-bridge" else - if [ "$CFG_ACCESSIBILITY" = "auto" ]; then - CFG_ACCESSIBILITY=no - else - echo "Accessibility support needs DBus." - exit 101 - fi + echo >&2 "Warning: Disabling Linux Accessibility Bridge: DBus is missing." + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ACCESSIBILITY_ATSPI_BRIDGE" fi fi fi |