summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1433
1 files changed, 168 insertions, 1265 deletions
diff --git a/configure b/configure
index a58256f089..ae8ca41a92 100755
--- a/configure
+++ b/configure
@@ -610,7 +610,6 @@ CFG_PROFILE=no
CFG_STRIP=yes
CFG_GUI=auto # (yes|no|auto)
CFG_WIDGETS=yes
-CFG_QCONFIG=full
CFG_DEBUG=auto
CFG_MYSQL_CONFIG=
CFG_PSQL_CONFIG=
@@ -619,28 +618,18 @@ CFG_FORCEDEBUGINFO=no
CFG_RELEASE_TOOLS=no
CFG_SHARED=yes
CFG_SM=auto
-CFG_XSHAPE=auto
-CFG_XSYNC=auto
-CFG_XFIXES=runtime
-CFG_ZLIB=auto
+CFG_SYSTEM_ZLIB=auto
CFG_MTDEV=auto
CFG_JOURNALD=no
CFG_SYSLOG=no
CFG_SQLITE=qt
-CFG_GIF=auto
+CFG_GIF=yes
CFG_PNG=yes
CFG_LIBPNG=auto
-CFG_JPEG=auto
+CFG_JPEG=yes
CFG_LIBJPEG=auto
-CFG_XCURSOR=runtime
-CFG_XRANDR=runtime
CFG_XRENDER=auto
-CFG_MITSHM=auto
CFG_OPENGL=auto
-CFG_OPENVG=auto
-CFG_OPENVG_LC_INCLUDES=no
-CFG_OPENVG_SHIVA=auto
-CFG_OPENVG_ON_OPENGL=auto
CFG_EGL=auto
CFG_EGL_X=auto
CFG_DOUBLECONVERSION=auto
@@ -666,7 +655,7 @@ CFG_SYSTEM_PROXIES=no
CFG_ANDROID_STYLE_ASSETS=yes
CFG_GSTREAMER=auto
CFG_GSTREAMER_VERSION=""
-CFG_ATOMIC64=auto
+CFG_STD_ATOMIC64=auto
# Target architecture
CFG_ARCH=
@@ -674,8 +663,6 @@ CFG_CPUFEATURES=
# Host architecture, same as CFG_ARCH when not cross-compiling
CFG_HOST_ARCH=
CFG_HOST_CPUFEATURES=
-# Set when the -arch or -host-arch arguments are used
-OPT_OBSOLETE_HOST_ARG=no
CFG_USE_GNUMAKE=no
CFG_XINPUT2=auto
@@ -700,7 +687,6 @@ CFG_KMS=auto
CFG_MIRCLIENT=auto
CFG_LIBUDEV=auto
CFG_LIBINPUT=auto
-CFG_OBSOLETE_WAYLAND=no
CFG_EVDEV=auto
CFG_TSLIB=auto
CFG_NIS=auto
@@ -709,7 +695,7 @@ CFG_ICONV=auto
CFG_DBUS=auto
CFG_GLIB=auto
CFG_GTK=auto
-CFG_LARGEFILE=auto
+CFG_LARGEFILE=yes
CFG_OPENSSL=auto
CFG_LIBPROXY=auto
CFG_SECURETRANSPORT=auto
@@ -780,7 +766,6 @@ CFG_SANITIZE_THREAD=no
CFG_SANITIZE_MEMORY=no
CFG_SANITIZE_UNDEFINED=no
CFG_PCRE=auto
-QPA_PLATFORM_GUARD=yes
CFG_STDCXX=auto
CFG_DIRECTWRITE=no
CFG_DIRECTWRITE2=auto
@@ -789,7 +774,6 @@ CFG_HEADERSCLEAN=auto
CFG_QREAL=double
OPT_MAC_SDK=
COMMERCIAL_USER=ask
-LICENSE_FILE=
CFG_DEV=no
# initalize variables used for installation
@@ -817,23 +801,23 @@ QT_HOST_DATA=
QT_EXT_PREFIX=
#flags for SQL drivers
-QT_CFLAGS_PSQL=
-QT_LFLAGS_PSQL=
-QT_CFLAGS_MYSQL=
-QT_LFLAGS_MYSQL=
-QT_LFLAGS_MYSQL_R=
-QT_CFLAGS_SQLITE=
-QT_LFLAGS_SQLITE=
-QT_LFLAGS_ODBC="-lodbc"
-QT_LFLAGS_TDS=
+QMAKE_CFLAGS_PSQL=
+QMAKE_LIBS_PSQL=
+QMAKE_CFLAGS_MYSQL=
+QMAKE_LIBS_MYSQL=
+QMAKE_LIBS_MYSQL_R=
+QMAKE_CFLAGS_SQLITE=
+QMAKE_LIBS_SQLITE=
+QMAKE_LIBS_ODBC="-lodbc"
+QMAKE_LIBS_TDS=
# flags for libdbus-1
-QT_CFLAGS_DBUS=
-QT_LIBS_DBUS=
+QMAKE_CFLAGS_DBUS=
+QMAKE_LIBS_DBUS=
# flags for Glib (X11 only)
-QT_CFLAGS_GLIB=
-QT_LIBS_GLIB=
+QMAKE_CFLAGS_GLIB=
+QMAKE_LIBS_GLIB=
# default qpa platform
QT_QPA_DEFAULT_PLATFORM=
@@ -850,11 +834,6 @@ CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST
# check SQL drivers available in this package
#-------------------------------------------------------------------------------
-# opensource version removes some drivers, so force them to be off
-CFG_SQL_tds=no
-CFG_SQL_oci=no
-CFG_SQL_db2=no
-
CFG_SQL_AVAILABLE=
if [ -d "$relpath/src/plugins/sqldrivers" ]; then
for a in "$relpath/src/plugins/sqldrivers/"*; do
@@ -866,16 +845,6 @@ if [ -d "$relpath/src/plugins/sqldrivers" ]; then
done
fi
-CFG_IMAGEFORMAT_PLUGIN_AVAILABLE=
-if [ -d "$relpath/src/plugins/imageformats" ]; then
- for a in "$relpath/src/plugins/imageformats/"*; do
- if [ -d "$a" ]; then
- base_a=`basename "$a"`
- CFG_IMAGEFORMAT_PLUGIN_AVAILABLE="${CFG_IMAGEFORMAT_PLUGIN_AVAILABLE} ${base_a}"
- fi
- done
-fi
-
#-------------------------------------------------------------------------------
# parse command line arguments
#-------------------------------------------------------------------------------
@@ -1001,16 +970,6 @@ while [ "$#" -gt 0 ]; do
VAL=$1
fi
;;
- -openvg)
- VAR=openvg
- # this option may or may not be followed by an argument
- if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
- VAL=yes
- else
- shift;
- VAL=$1
- fi
- ;;
-gstreamer)
VAR=gstreamer
# this option may or may not be followed by an argument
@@ -1050,16 +1009,6 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
- -fpu)
- VAR="fpu"
- # this option may or may not be followed by an argument
- if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
- VAL=no
- else
- shift
- VAL=$1
- fi
- ;;
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
@@ -1136,9 +1085,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- license)
- LICENSE_FILE="$VAL"
- ;;
gnumake)
CFG_USE_GNUMAKE="$VAL"
;;
@@ -1218,9 +1164,6 @@ while [ "$#" -gt 0 ]; do
testsdir)
QT_INSTALL_TESTS="$VAL"
;;
- qconfig)
- CFG_QCONFIG="$VAL"
- ;;
qreal)
CFG_QREAL="$VAL"
if [ "$CFG_QREAL" = "float" ]; then
@@ -1285,13 +1228,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- openvg)
- if [ "$VAL" = "auto" ] || [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_OPENVG="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
nomake)
if [ -n "${QT_ALL_BUILD_PARTS%%* $VAL *}" ]; then
echo "Unknown part $VAL passed to -nomake." >&2
@@ -1333,9 +1269,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- arch|host-arch)
- OPT_OBSOLETE_HOST_ARG=yes
- ;;
harfbuzz)
[ "$VAL" = "yes" ] && VAL=qt
if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
@@ -1382,48 +1315,6 @@ while [ "$#" -gt 0 ]; do
;;
platform)
PLATFORM="$VAL"
- # keep compatibility with old platform names
- case $PLATFORM in
- aix-64)
- PLATFORM=aix-xlc-64
- ;;
- hpux-o64)
- PLATFORM=hpux-acc-o64
- ;;
- hpux-n64)
- PLATFORM=hpux-acc-64
- ;;
- hpux-acc-n64)
- PLATFORM=hpux-acc-64
- ;;
- irix-n32)
- PLATFORM=irix-cc
- ;;
- irix-64)
- PLATFORM=irix-cc-64
- ;;
- irix-cc-n64)
- PLATFORM=irix-cc-64
- ;;
- reliant-64)
- PLATFORM=reliant-cds-64
- ;;
- solaris-64)
- PLATFORM=solaris-cc-64
- ;;
- openunix-cc)
- PLATFORM=unixware-cc
- ;;
- openunix-g++)
- PLATFORM=unixware-g++
- ;;
- unixware7-cc)
- PLATFORM=unixware-cc
- ;;
- unixware7-g++)
- PLATFORM=unixware-g++
- ;;
- esac
;;
xplatform)
XPLATFORM="$VAL"
@@ -1543,20 +1434,6 @@ while [ "$#" -gt 0 ]; do
fi
;;
- xshape)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_XSHAPE="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
- xsync)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_XSYNC="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
xinput2)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_XINPUT2="$VAL"
@@ -1685,14 +1562,13 @@ while [ "$#" -gt 0 ]; do
fi
;;
zlib)
- [ "$VAL" = "qt" ] && VAL=yes
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
- CFG_ZLIB="$VAL"
+ if [ "$VAL" = "system" ]; then
+ CFG_SYSTEM_ZLIB="yes"
+ elif [ "$VAL" = "qt" ]; then
+ CFG_SYSTEM_ZLIB="no"
else
UNKNOWN_OPT=yes
fi
- # No longer supported:
- #[ "$VAL" = "no" ] && CFG_LIBPNG=no
;;
mtdev)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
@@ -1738,27 +1614,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- xcursor)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
- CFG_XCURSOR="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
- xfixes)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
- CFG_XFIXES="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
- xrandr)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then
- CFG_XRANDR="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
xrender)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_XRENDER="$VAL"
@@ -1766,13 +1621,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- mitshm)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_MITSHM="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
doubleconversion)
if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
CFG_DOUBLECONVERSION="$VAL"
@@ -1833,9 +1681,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- wayland)
- CFG_OBSOLETE_WAYLAND=yes
- ;;
eglfs)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_EGLFS="$VAL"
@@ -2007,7 +1852,7 @@ while [ "$#" -gt 0 ]; do
;;
qpa-platform-guard)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- QPA_PLATFORM_GUARD="$VAL"
+ echo "WARNING: The [-no]-qpa-platform-guard argument is deprecated and has no effect."
else
UNKNOWN_OPT=yes
fi
@@ -2043,13 +1888,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- largefile)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_LARGEFILE="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
openssl)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_OPENSSL="$VAL"
@@ -2103,12 +1941,11 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- sql-*|imageformat-*)
- # if Qt style options were used, $VAL can be "no", "qt", or "plugin"
- # if autoconf style options were used, $VAL can be "yes" or "no"
- [ "$VAL" = "yes" ] && VAL=qt
- # now $VAL should be "no", "qt", or "plugin"... double-check
- if [ "$VAL" != "no" ] && [ "$VAL" != "qt" ] && [ "$VAL" != "plugin" ]; then
+ sql-*)
+ # if Qt style options were used, $VAL can be "no", "yes", or "plugin", plugin for backwards compatibility
+ [ "$VAL" = "plugin" ] && VAL=yes
+ # now $VAL should be "yes" or "no"... double-check
+ if [ "$VAL" != "no" ] && [ "$VAL" != "yes" ]; then
UNKNOWN_OPT=yes
fi
# now $VAL is "no", "qt", or "plugin"
@@ -2116,27 +1953,9 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $VAR | sed 's,^[^-]*-\([^-]*\).*,\1,'`
VAR=`echo $VAR | sed 's,^\([^-]*\).*,\1,'`
- # Grab the available values
- case "$VAR" in
- sql)
- avail="$CFG_SQL_AVAILABLE"
- ;;
- imageformat)
- avail="$CFG_IMAGEFORMAT_PLUGIN_AVAILABLE"
- if [ "$OPT" != "plugin" ]; then
- # png is always built in
- avail="$avail png"
- fi
- ;;
- *)
- avail=""
- echo "BUG: Unhandled type $VAR used in $CURRENT_OPT"
- ;;
- esac
-
# Check that that user's value is available.
found=no
- for d in $avail; do
+ for d in $CFG_SQL_AVAILABLE; do
if [ "$VAL" = "$d" ]; then
found=yes
break
@@ -2148,28 +1967,8 @@ while [ "$#" -gt 0 ]; do
continue
fi
- if [ "$VAR" = "sql" ]; then
- # set the CFG_SQL_driver
- eval "CFG_SQL_$VAL=\$OPT"
- continue
- elif [ "$VAR" = "imageformat" ]; then
- [ "$OPT" = "qt" ] && OPT=yes
- VAL="`echo $VAL |tr a-z A-Z`"
- eval "CFG_$VAL=$OPT"
- continue
- fi
-
- if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then
- if [ "$OPT" = "plugin" ]; then
- VAR="${VAR}-${OPT}"
- fi
- QMakeVar add "${VAR}s" "${VAL}"
- elif [ "$OPT" = "no" ]; then
- PLUG_VAR="${VAR}-plugin"
- IN_VAR="${VAR}"
- QMakeVar del "${IN_VAR}s" "$VAL"
- QMakeVar del "${PLUG_VAR}s" "$VAL"
- fi
+ # set the CFG_SQL_driver
+ eval "CFG_SQL_$VAL=\$OPT"
;;
v|verbose)
if [ "$VAL" = "yes" ]; then
@@ -2372,456 +2171,9 @@ done
#-------------------------------------------------------------------------------
if [ "$OPT_HELP" = "yes" ]; then
- cat <<EOF
-Usage: $relconf [options]
-
-Installation options:
-
- These are optional, but you may specify install directories.
-
- -prefix <dir> ...... The deployment directory, as seen on the target device.
- (default /usr/local/Qt-${QT_VERSION}, \$PWD if -developer-build is active)
-
- -extprefix <dir> ... The installation directory, as seen on the host machine.
- (default SYSROOT/PREFIX)
-
- -hostprefix [dir] .. The installation directory for build tools running on the
- host machine. If [dir] is not given, the current build
- directory will be used. (default EXTPREFIX)
-
- You may use these to change the layout of the install. Note that all directories
- except -sysconfdir should be located under -prefix/-hostprefix:
-
- -bindir <dir> ......... User executables will be installed to <dir>
- (default PREFIX/bin)
- -headerdir <dir> ...... Headers will be installed to <dir>
- (default PREFIX/include)
- -libdir <dir> ......... Libraries will be installed to <dir>
- (default PREFIX/lib)
- -archdatadir <dir> .... Arch-dependent data used by Qt will be installed to <dir>
- (default PREFIX)
- -plugindir <dir> ...... Plugins will be installed to <dir>
- (default ARCHDATADIR/plugins)
- -libexecdir <dir> ..... Program executables will be installed to <dir>
- (default ARCHDATADIR/libexec, ARCHDATADIR/bin for MinGW)
- -importdir <dir> ...... Imports for QML1 will be installed to <dir>
- (default ARCHDATADIR/imports)
- -qmldir <dir> ......... Imports for QML2 will be installed to <dir>
- (default ARCHDATADIR/qml)
- -datadir <dir> ........ Arch-independent data used by Qt will be installed to <dir>
- (default PREFIX)
- -docdir <dir> ......... Documentation will be installed to <dir>
- (default DATADIR/doc)
- -translationdir <dir> . Translations of Qt programs will be installed to <dir>
- (default DATADIR/translations)
- -sysconfdir <dir> ..... Settings used by Qt programs will be looked for in <dir>
- (default PREFIX/etc/xdg)
- -examplesdir <dir> .... Examples will be installed to <dir>
- (default PREFIX/examples)
- -testsdir <dir> ....... Tests will be installed to <dir>
- (default PREFIX/tests)
-
- -hostbindir <dir> .. Host executables will be installed to <dir>
- (default HOSTPREFIX/bin)
- -hostlibdir <dir> .. Host libraries will be installed to <dir>
- (default HOSTPREFIX/lib)
- -hostdatadir <dir> . Data used by qmake will be installed to <dir>
- (default HOSTPREFIX)
-
-Configure options:
-
- The defaults (*) are usually acceptable. A plus (+) denotes a default value
- that needs to be evaluated. If the evaluation succeeds, the feature is
- included. Here is a short explanation of each option:
-
- * -release ........... Compile and link Qt with debugging turned off.
- -debug ............. Compile and link Qt with debugging turned on.
- -debug-and-release . Compile and link two versions of Qt, with and without
- debugging turned on (Mac only).
-
- -force-debug-info .. Create symbol files for release builds.
-
- -developer-build ... Compile and link Qt with Qt developer options (including auto-tests exporting)
-
- * -no-optimized-tools ... Do not build optimized host tools even in debug build.
- -optimized-tools ...... Build optimized host tools even in debug build.
-
- -opensource ........ Compile and link the Open-Source Edition of Qt.
- -commercial ........ Compile and link the Commercial Edition of Qt.
-
- -confirm-license ... Automatically acknowledge the license (use with
- either -opensource or -commercial)
-
- -c++std <edition> .. Compile Qt with C++ standard edition (c++11, c++14, c++1z)
- Default: highest supported
-
- * -shared ............ Create and use shared Qt libraries.
- -static ............ Create and use static Qt libraries.
-
- -no-largefile ...... Disables large file support.
- + -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.
- -qt-sql-<driver> ... Enable a SQL <driver> in the Qt SQL module, by default
- none are turned on.
- -plugin-sql-<driver> Enable SQL <driver> as a plugin to be linked to
- at run time.
-
- Possible values for <driver>:
- [$CFG_SQL_AVAILABLE ]
-
- -system-sqlite ..... Use sqlite from the operating system.
-
- -no-qml-debug ...... Do not build the in-process QML debugging support.
- + -qml-debug ......... Build the QML debugging support.
-
- -platform target ... The operating system and compiler you are building
- on (default detected from host system).
-
- See the README file for a list of supported
- operating systems and compilers.
-
- -no-sse2 ........... Do not compile with use of SSE2 instructions.
- -no-sse3 ........... Do not compile with use of SSE3 instructions.
- -no-ssse3 .......... Do not compile with use of SSSE3 instructions.
- -no-sse4.1 ......... Do not compile with use of SSE4.1 instructions.
- -no-sse4.2 ......... Do not compile with use of SSE4.2 instructions.
- -no-avx ............ Do not compile with use of AVX instructions.
- -no-avx2 ........... Do not compile with use of AVX2 instructions.
- -no-avx512 ......... Do not compile with use of AVX512 instructions.
- -no-mips_dsp ....... Do not compile with use of MIPS DSP instructions.
- -no-mips_dspr2 ..... Do not compile with use of MIPS DSP rev2 instructions.
-
- -qtnamespace <name> Wraps all Qt library code in 'namespace <name> {...}'.
- -qtlibinfix <infix> Renames all libQt*.so to libQt*<infix>.so.
-
- -testcocoon ........ Instrument Qt with the TestCocoon code coverage tool.
- -gcov .............. Instrument Qt with the GCov code coverage tool.
-
- -D <string> ........ Add an explicit define to the preprocessor.
- -I <string> ........ Add an explicit include path.
- -L <string> ........ Add an explicit library path.
-
- + -pkg-config ........ Use pkg-config to detect include and library paths. By default,
- configure determines whether to use pkg-config or not with
- some heuristics such as checking the environment variables.
- -no-pkg-config ..... Disable use of pkg-config.
- -force-pkg-config .. Force usage of pkg-config (skips pkg-config usability
- detection heuristic).
-
- -help, -h .......... Display this information.
-
-Third Party Libraries:
-
- -qt-zlib ............ Use the zlib bundled with Qt.
- + -system-zlib ........ Use zlib from the operating system.
- See http://www.gzip.org/zlib
-
- -no-mtdev ........... Do not compile mtdev support.
- + -mtdev .............. Enable mtdev support.
-
- + -no-journald ........ Do not send logging output to journald.
- -journald ........... Send logging output to journald.
-
- + -no-syslog .......... Do not send logging output to syslog.
- -syslog ............. Send logging output to syslog.
-
- -no-gif ............. Do not compile GIF reading support.
-
- -no-libpng .......... Do not compile PNG support.
- -qt-libpng .......... Use the libpng bundled with Qt.
- + -system-libpng ...... Use libpng from the operating system.
- See http://www.libpng.org/pub/png
-
- -no-libjpeg ......... Do not compile JPEG support.
- -qt-libjpeg ......... Use the libjpeg bundled with Qt.
- + -system-libjpeg ..... Use libjpeg from the operating system.
- See http://www.ijg.org
-
- -no-doubleconversion ..... Use sscanf_l and snprintf_l for (imprecise) double conversion.
- -qt-doubleconversion ..... Use the libdouble-conversion bundled with Qt.
- + -system-doubleconversion . Use the libdouble-conversion provided by the system.
- See https://github.com/google/double-conversion
-
- -no-freetype ........ Do not compile in Freetype2 support.
- -qt-freetype ........ Use the libfreetype bundled with Qt.
- + -system-freetype..... Use the libfreetype provided by the system (enabled if -fontconfig is active).
- See http://www.freetype.org
-
- -no-harfbuzz ........ Do not compile HarfBuzz-NG support.
- -qt-harfbuzz ........ Use HarfBuzz-NG bundled with Qt to do text shaping.
- It can still be disabled by setting
- the QT_HARFBUZZ environment variable to "old".
- + -system-harfbuzz .... Use HarfBuzz-NG from the operating system
- to do text shaping. It can still be disabled
- by setting the QT_HARFBUZZ environment variable to "old".
- See http://www.harfbuzz.org
-
- -no-openssl ......... Do not compile support for OpenSSL.
- + -openssl ............ Enable run-time OpenSSL support.
- -openssl-linked ..... Enabled linked OpenSSL support.
-
- -no-libproxy ....... Do not compile support for libproxy
- + -libproxy .......... Use libproxy from the operating system.
-
- -qt-pcre ............ Use the PCRE library bundled with Qt.
- + -system-pcre ........ Use the PCRE library from the operating system.
-
- -qt-xcb ............. Use xcb- libraries bundled with Qt.
- (libxcb.so will still be used from operating system).
- + -system-xcb ......... Use xcb- libraries from the operating system.
-
- -xkb-config-root .... Set default XKB config root. This option is used only together with -qt-xkbcommon-x11.
- -qt-xkbcommon-x11 ... Use the xkbcommon library bundled with Qt in combination with xcb.
- + -system-xkbcommon-x11 Use the xkbcommon library from the operating system in combination with xcb.
-
- -no-xkbcommon-evdev . Do not use X-less xkbcommon when compiling libinput support.
- * -xkbcommon-evdev .... Use X-less xkbcommon when compiling libinput support.
-
- -no-xinput2 ......... Do not compile XInput2 support.
- * -xinput2 ............ Compile XInput2 support.
-
- -no-xcb-xlib......... Do not compile Xcb-Xlib support.
- * -xcb-xlib............ Compile Xcb-Xlib support.
-
- -no-glib ............ Do not compile Glib support.
- + -glib ............... Compile Glib support.
-
- -no-pulseaudio ...... Do not compile PulseAudio support.
- + -pulseaudio ......... Compile PulseAudio support.
-
- -no-alsa ............ Do not compile ALSA support.
- + -alsa ............... Compile ALSA support.
-
- -no-gtk ............. Do not compile GTK platform theme support.
- + -gtk ................ Compile GTK platform theme support.
-
-Additional options:
-
- -make <part> ....... Add part to the list of parts to be built at make time.
- (defaults to: $QT_DEFAULT_BUILD_PARTS)
- -nomake <part> ..... Exclude part from the list of parts to be built.
-
- -skip <module> ..... Exclude an entire module from the build.
-
- -no-compile-examples ... Install only the sources of examples.
-
- -no-gui ............ Don't build the Qt GUI module and dependencies.
- + -gui ............... Build the Qt GUI module and dependencies.
-
- -no-widgets ........ Don't build the Qt Widgets module and dependencies.
- + -widgets ........... Build the Qt Widgets module and dependencies.
-
- -R <string> ........ Add an explicit runtime library path to the Qt
- libraries.
- -l <string> ........ Add an explicit library.
-
- -no-rpath .......... Do not use the library install path as a runtime
- 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
-
- -continue .......... Continue as far as possible if an error occurs.
-
- -verbose, -v ....... Print verbose information about each step of the
- configure process.
-
- -silent ............ Reduce the build output so that warnings and errors
- can be seen more easily.
-
- -no-nis ............ Do not compile NIS support.
- * -nis ............... Compile NIS support.
-
- -no-cups ........... Do not compile CUPS support.
- * -cups .............. Compile CUPS support.
- Requires cups/cups.h and libcups.so.2.
-
- -no-iconv .......... Do not compile support for iconv(3).
- * -iconv ............. Compile support for iconv(3).
-
- -no-evdev .......... Do not compile support for evdev.
- * -evdev ............. Compile support for evdev.
-
- -no-tslib .......... Do not compile support for tslib.
- * -tslib ............. Compile support for tslib.
-
- -no-icu ............ Do not compile support for ICU libraries.
- + -icu ............... Compile support for ICU libraries.
-
- -no-fontconfig ..... Do not compile FontConfig support.
- + -fontconfig ........ Compile FontConfig support.
-
- -no-strip .......... Do not strip binaries and libraries of unneeded symbols.
- * -strip ............. Strip binaries and libraries of unneeded symbols when installing.
-
- * -no-pch ............ Do not use precompiled header support.
- -pch ............... Use precompiled header support.
-
- * -no-ltcg Do not use Link Time Code Generation
- -ltcg Use Link Time Code Generation.
-
- -no-dbus ........... Do not compile the Qt D-Bus module.
- + -dbus-linked ....... Compile the Qt D-Bus module and link to libdbus-1.
- -dbus-runtime ...... Compile the Qt D-Bus module and dynamically load libdbus-1.
-
- -reduce-relocations ..... Reduce relocations in the libraries through extra
- linker optimizations (Qt/X11 and Qt for Embedded Linux only;
- experimental; needs GNU ld >= 2.18).
-
- -no-use-gold-linker ..... Do not link using the GNU gold linker.
- + -use-gold-linker ........ Link using the GNU gold linker if available.
-
- -force-asserts ........ Force Q_ASSERT to be enabled even in release builds.
-
- -sanitize [address|thread|memory|undefined] Enables the specified compiler sanitizer.
-
- -device <name> ............... Cross-compile for device <name> (experimental)
- -device-option <key=value> ... Add device specific options for the device mkspec
- (experimental)
-
- -host-option <key=value> ..... Add host specific options for the host mkspec
-
- * -no-separate-debug-info . Do not store debug information in a separate file.
- -separate-debug-info .... Strip debug information into a separate file.
-
- -no-xcb ............ Do not compile Xcb (X protocol C-language Binding) support.
- * -xcb ............... Compile Xcb support.
-
- -no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support.
- * -eglfs ............. Compile EGLFS support.
-
- -no-kms ............ Do not compile backends for KMS.
- * -kms ............... Compile backends for KMS.
-
- -no-gbm ............ Do not compile backends for GBM.
- * -gbm ............... Compile backends for GBM.
-
- * -no-directfb ....... Do not compile DirectFB support.
- -directfb .......... Compile DirectFB support.
-
- -no-linuxfb ........ Do not compile Linux Framebuffer support.
- * -linuxfb ........... Compile Linux Framebuffer support.
-
- * -no-mirclient....... Do not compile Mir client support.
- -mirclient.......... Compile Mir client support.
-
- -qpa <name> ......... Sets the default QPA platform (e.g xcb, cocoa, windows).
-
- -xplatform target ... The target platform when cross-compiling.
-
- -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths.
- -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler
-
- -external-hostbindir <path> .. Path to Qt tools built for this machine. Use this when -platform
- does not match the current system, i.e., to make a Canadian Cross Build.
-
- -no-feature-<feature> Do not compile in <feature>.
- -feature-<feature> .. Compile in <feature>. The available features
- are described in src/corelib/global/qfeatures.txt
-
- -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the
- default ($CFG_QCONFIG).
-
- -qreal [double|float] typedef qreal to the specified type. The default is double.
- Note that changing this flag affects binary compatibility.
-
- -no-opengl .......... Do not support OpenGL.
- -opengl <api> ....... Enable OpenGL support
- With no parameter, this will attempt to auto-detect
- OpenGL ES 2.0 and higher, or regular desktop OpenGL.
- Use es2 for <api> to override auto-detection.
-
- -no-libinput ........ Do not support libinput.
- * -libinput ........... Enable libinput support.
-
- -no-gstreamer ....... Do not support GStreamer.
- + -gstreamer <version> Enable GStreamer support
- With no parameter, this will attempt to auto-detect GStreamer 0.10 and
- 1.0. GStreamer 1.0 is used by default when available.
- Use 0.10 or 1.0 for <version> to override auto-detection.
-
- * -no-system-proxies .. Do not use system network proxies by default.
- -system-proxies ..... Use system network proxies by default.
-
- -no-warnings-are-errors Make warnings be treated normally
- -warnings-are-errors Make warnings be treated as errors
- (enabled if -developer-build is active)
-
-QNX options:
-
- -no-slog2 .......... Do not compile with slog2 support.
- -slog2 ............. Compile with slog2 support.
-
- -no-pps ............ Do not compile with pps support.
- -pps ............... Compile with pps support.
-
- -no-imf ............ Do not compile with imf support.
- -imf ............... Compile with imf support.
-
- -no-lgmon .......... Do not compile with lgmon support.
- -lgmon ............. Compile with lgmon support.
-
-MacOS/iOS options:
-
- -Fstring ........... Add an explicit framework path.
- -fw string ......... Add an explicit framework.
-
- * -framework ......... Build Qt as a series of frameworks and
- link tools against those frameworks.
- -no-framework ...... Do not build Qt as a series of frameworks.
-
- * -securetransport ... Use SecureTransport instead of OpenSSL
-
- -no-securetransport Do not use SecureTransport, either use OpenSSL or do not use any SSL backend
- at all (if combined with -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'.
- Note that the argument applies only to Qt libraries and applications built
- using the target mkspec - not host tools such as qmake, moc, rcc, etc.
-
-Android options:
-
- -android-sdk path .............. The Android SDK root path.
- (default \$ANDROID_SDK_ROOT)
-
- -android-ndk path .............. The Android NDK root path.
- (default \$ANDROID_NDK_ROOT)
-
- -android-ndk-platform .......... Sets the android platform
- (default $CFG_DEFAULT_ANDROID_PLATFORM)
-
- -android-ndk-host .............. Sets the android NDK host (linux-x86, linux-x86_64, etc.)
- (default \$ANDROID_NDK_HOST)
-
- -android-arch .................. Sets the android architecture (armeabi, armeabi-v7a, x86, mips,
- arm64-v8a, x86_64, mips64)
- (default $CFG_DEFAULT_ANDROID_TARGET_ARCH)
-
- -android-toolchain-version ..... Sets the android toolchain version
- (default $CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION)
-
- -no-android-style-assets ....... Do not compile in the code which automatically extracts
- style assets from the run-time device. Setting this will
- make the Android style behave incorrectly, but will enable
- compatibility with the LGPL2.1 license.
- * -android-style-assets .......... Compile the code which automatically extracts style assets
- from the run-time device. This option will make the
- Android platform plugin incompatible with the LGPL2.1.
-EOF
-
- exit 0
-fi # Help
+ cat $relpath/config_help.txt
+ exit 0
+fi
#-------------------------------------------------------------------------------
# platform detection
@@ -2831,27 +2183,7 @@ if [ -z "$PLATFORM" ]; then
PLATFORM_NOTES=
case "$UNAME_SYSTEM:$UNAME_RELEASE" in
Darwin:*)
- # Select compiler. Use g++ unless we find a usable Clang version. Note that
- # we are checking the "Apple" clang/LLVM version number, not the actual
- # clang/LLVM version number that the Apple version was based on. We look
- # for Apple clang version 3.0 or higher, which was branched off LLVM 3.0
- # from SVN, and first included in Xcode 4.2. Also note that we do not care
- # about the OS version, since we're not using the clang version that comes
- # with the system. We use 'xcrun' to check the clang version that's part of
- # the Xcode installation.
- XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`
- CLANGVERSION=`echo "$XCRUN" | sed -n 's/.*version \([0-9]\).*/\1/p'`
- expr "$CLANGVERSION" : '[0-9]' > /dev/null || { echo "Unable to determine CLANG version from output of xcrun: $XCRUN" ; exit 2 ; }
- if [ "$CLANGVERSION" -ge 3 ]; then
- PLATFORM=macx-clang
-
- # Advertise g++ as an alternative on Lion and below
- if [ "$(uname -r | cut -d. -f1)" -le 11 ]; then
- PLATFORM_NOTES="\n - Also available for Mac OS X: macx-g++\n"
- fi
- else
- PLATFORM=macx-g++
- fi
+ PLATFORM=macx-clang
;;
AIX:*)
#PLATFORM=aix-g++
@@ -3186,31 +2518,6 @@ fi
# command line and environment validation
#-------------------------------------------------------------------------------
-# update QT_CONFIG to show our current predefined configuration
-CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
-case "$CFG_QCONFIG" in
-minimal|small|medium|large|full)
- # these are a sequence of increasing functionality
- for c in minimal small medium large full; do
- QT_CONFIG="$QT_CONFIG $c-config"
- [ "$CFG_QCONFIG" = $c ] && break
- done
- [ "$CFG_QCONFIG" = full ] && CFG_QCONFIG_PATH=
- ;;
-*)
- # not known to be sufficient for anything
- if [ ! -f "$CFG_QCONFIG_PATH" ]; then
- CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"`
- if [ ! -f "$CFG_QCONFIG_PATH" ]; then
- echo >&2 "Error: configuration file not found:"
- echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
- echo >&2 " or"
- echo >&2 " $CFG_QCONFIG_PATH"
- exit 1
- fi
- fi
-esac
-
if [ "$XPLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then
echo
echo "WARNING: -debug-and-release is not supported outside of Mac OS X."
@@ -4455,28 +3762,13 @@ if $stdcxx_error && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
exit 101
fi
-# Detect which edition of the C++ standard the compiler defaults to
-CFG_STDCXX_DEFAULT=199711
-if compileTest common/c++default "default C++ standard edition"; then
- if [ -e "$outpath/config.tests/common/c++default/c++default.ii" ]; then
- CFG_STDCXX_DEFAULT=`sed -n '/^[0-9]/s/L//p' "$outpath/config.tests/common/c++default/c++default.ii"`
- else
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo "Failed to run the preprocessor, something is wrong with your compiler"
- fi
- if [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
- exit 101
- fi
- fi
-fi
-
# Detect whether 64-bit std::atomic works -- some 32-bit platforms require extra library support
if compileTest common/atomic64 "64-bit std::atomic"; then
- CFG_ATOMIC64=yes
+ CFG_STD_ATOMIC64=yes
elif compileTest common/atomic64 "64-bit std::atomic in -latomic" -latomic; then
- CFG_ATOMIC64=libatomic
+ CFG_STD_ATOMIC64=libatomic
else
- CFG_ATOMIC64=no
+ CFG_STD_ATOMIC64=no
fi
# detect sse2 support
@@ -4666,21 +3958,6 @@ if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
fi
fi
-# detect zlib
-if [ "$CFG_ZLIB" = "no" ]; then
- # Note: Qt no longer support builds without zlib
- # So we force a "no" to be "auto" here.
- # If you REALLY really need no zlib support, you can still disable
- # it by doing the following:
- # add "no-zlib" to mkspecs/qconfig.pri
- # #define QT_NO_COMPRESS (probably by adding to src/corelib/global/qconfig.h)
- #
- # There's no guarantee that Qt will build under those conditions
-
- CFG_ZLIB=auto
- ZLIB_FORCED=yes
-fi
-
if [ "$XPLATFORM_QNX" = "yes" ]; then
if [ "$CFG_SLOG2" != "no" ]; then
if compileTest unix/slog2 "slog2"; then
@@ -4723,11 +4000,12 @@ if [ "$XPLATFORM_INTEGRITY" = "yes" ]; then
CFG_LARGEFILE=no
fi
-if [ "$CFG_ZLIB" = "auto" ]; then
+# detect zlib
+if [ "$CFG_SYSTEM_ZLIB" = "auto" ]; then
if compileTest unix/zlib "zlib"; then
- CFG_ZLIB=system
+ CFG_SYSTEM_ZLIB=yes
else
- CFG_ZLIB=yes
+ CFG_SYSTEM_ZLIB=no
fi
fi
@@ -4776,23 +4054,6 @@ if [ "$CFG_SYSLOG" != "no" ]; then
fi
fi
-if [ "$CFG_LARGEFILE" = "auto" ]; then
- #Large files should be enabled for all Linux systems
- CFG_LARGEFILE=yes
-fi
-
-if [ "$CFG_GUI" = "no" ]; then
- QPA_PLATFORM_GUARD=no
-fi
-
-# detect how jpeg should be built
-if [ "$CFG_JPEG" = "auto" ]; then
- if [ "$CFG_SHARED" = "yes" ]; then
- CFG_JPEG=plugin
- else
- CFG_JPEG=yes
- fi
-fi
# detect jpeg
if [ "$CFG_LIBJPEG" = "auto" ]; then
if compileTest unix/libjpeg "libjpeg"; then
@@ -4802,15 +4063,6 @@ if [ "$CFG_LIBJPEG" = "auto" ]; then
fi
fi
-# detect how gif should be built
-if [ "$CFG_GIF" = "auto" ]; then
- if [ "$CFG_SHARED" = "yes" ]; then
- CFG_GIF=plugin
- else
- CFG_GIF=yes
- fi
-fi
-
# detect png
if [ "$CFG_LIBPNG" = "auto" ]; then
if compileTest unix/libpng "libpng"; then
@@ -4841,10 +4093,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
if [ "$CFG_SQL_mysql" != "no" ]; then
[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config`
if [ -x "$CFG_MYSQL_CONFIG" ]; then
- QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null | filterIncludeOptions`
+ QMAKE_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null | filterIncludeOptions`
# -rdynamic should not be returned by mysql_config, but is on RHEL 6.6
- QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"`
- QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"`
+ QMAKE_LIBS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"`
+ QMAKE_LIBS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null | filterLibraryOptions | sed "s/-rdynamic//"`
QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
fi
@@ -4857,21 +4109,17 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
exit 101
else
CFG_SQL_mysql="no"
- QT_LFLAGS_MYSQL=""
- QT_LFLAGS_MYSQL_R=""
- QT_CFLAGS_MYSQL=""
+ QMAKE_LIBS_MYSQL=""
+ QMAKE_LIBS_MYSQL_R=""
+ QMAKE_CFLAGS_MYSQL=""
fi
else
- if compileTest unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $QT_CFLAGS_MYSQL; then
+ if compileTest unix/mysql_r "MySQL (thread-safe)" $QMAKE_LIBS_MYSQL_R $QMAKE_CFLAGS_MYSQL; then
QMakeVar add CONFIG use_libmysqlclient_r
- if [ "$CFG_SQL_mysql" = "auto" ]; then
- CFG_SQL_mysql=plugin
- fi
- QT_LFLAGS_MYSQL="$QT_LFLAGS_MYSQL_R"
- elif compileTest unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $QT_CFLAGS_MYSQL; then
- if [ "$CFG_SQL_mysql" = "auto" ]; then
- CFG_SQL_mysql=plugin
- fi
+ CFG_SQL_mysql=yes
+ QMAKE_LIBS_MYSQL="$QMAKE_LIBS_MYSQL_R"
+ elif compileTest unix/mysql "MySQL (thread-unsafe)" $QMAKE_LIBS_MYSQL $QMAKE_CFLAGS_MYSQL; then
+ CFG_SQL_mysql=yes
else
if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "MySQL support cannot be enabled due to functionality tests!"
@@ -4881,9 +4129,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
exit 101
else
CFG_SQL_mysql=no
- QT_LFLAGS_MYSQL=""
- QT_LFLAGS_MYSQL_R=""
- QT_CFLAGS_MYSQL=""
+ QMAKE_LIBS_MYSQL=""
+ QMAKE_LIBS_MYSQL_R=""
+ QMAKE_CFLAGS_MYSQL=""
fi
fi
fi
@@ -4894,17 +4142,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
[ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
# Be careful not to use native pg_config when cross building.
if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
- QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath`
- QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
+ QMAKE_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath`
+ QMAKE_LIBS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
fi
- [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
- [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+ [ -z "$QMAKE_CFLAGS_PSQL" ] || QMAKE_CFLAGS_PSQL="-I$QMAKE_CFLAGS_PSQL"
+ [ -z "$QMAKE_LIBS_PSQL" ] || QMAKE_LIBS_PSQL="-L$QMAKE_LIBS_PSQL"
# But, respect PSQL_LIBS if set
- [ -z "$PSQL_LIBS" ] || QT_LFLAGS_PSQL="$PSQL_LIBS"
- if compileTest unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $QT_CFLAGS_PSQL; then
- if [ "$CFG_SQL_psql" = "auto" ]; then
- CFG_SQL_psql=plugin
- fi
+ [ -z "$PSQL_LIBS" ] || QMAKE_LIBS_PSQL="$PSQL_LIBS"
+ if compileTest unix/psql "PostgreSQL" $QMAKE_LIBS_PSQL $QMAKE_CFLAGS_PSQL; then
+ CFG_SQL_psql=yes
else
if [ "$CFG_SQL_psql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "PostgreSQL support cannot be enabled due to functionality tests!"
@@ -4914,8 +4160,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
exit 101
else
CFG_SQL_psql=no
- QT_CFLAGS_PSQL=""
- QT_LFLAGS_PSQL=""
+ QMAKE_CFLAGS_PSQL=""
+ QMAKE_LIBS_PSQL=""
fi
fi
fi
@@ -4923,15 +4169,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
odbc)
if [ "$CFG_SQL_odbc" != "no" ]; then
if [ "$XPLATFORM_MAC" != "yes" ] && compileTest unix/odbc "ODBC"; then
- if [ "$CFG_SQL_odbc" = "auto" ]; then
- CFG_SQL_odbc=plugin
- fi
+ CFG_SQL_odbc=yes
else
if compileTest unix/iodbc "iODBC"; then
- QT_LFLAGS_ODBC="-liodbc"
- if [ "$CFG_SQL_odbc" = "auto" ]; then
- CFG_SQL_odbc=plugin
- fi
+ QMAKE_LIBS_ODBC="-liodbc"
+ CFG_SQL_odbc=yes
else
if [ "$CFG_SQL_odbc" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "ODBC support cannot be enabled due to functionality tests!"
@@ -4949,9 +4191,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
oci)
if [ "$CFG_SQL_oci" != "no" ]; then
if compileTest unix/oci "OCI"; then
- if [ "$CFG_SQL_oci" = "auto" ]; then
- CFG_SQL_oci=plugin
- fi
+ CFG_SQL_oci=yes
else
if [ "$CFG_SQL_oci" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "Oracle (OCI) support cannot be enabled due to functionality tests!"
@@ -4967,12 +4207,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
;;
tds)
if [ "$CFG_SQL_tds" != "no" ]; then
- [ -z "$SYBASE" ] || QT_LFLAGS_TDS="-L$SYBASE/lib"
- [ -z "$SYBASE_LIBS" ] || QT_LFLAGS_TDS="$QT_LFLAGS_TDS $SYBASE_LIBS"
- if compileTest unix/tds "TDS" $QT_LFLAGS_TDS; then
- if [ "$CFG_SQL_tds" = "auto" ]; then
- CFG_SQL_tds=plugin
- fi
+ [ -z "$SYBASE" ] || QMAKE_LIBS_TDS="-L$SYBASE/lib"
+ [ -z "$SYBASE_LIBS" ] || QMAKE_LIBS_TDS="$QMAKE_LIBS_TDS $SYBASE_LIBS"
+ if compileTest unix/tds "TDS" $QMAKE_LIBS_TDS; then
+ CFG_SQL_tds=yes
else
if [ "$CFG_SQL_tds" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "TDS support cannot be enabled due to functionality tests!"
@@ -4989,9 +4227,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
db2)
if [ "$CFG_SQL_db2" != "no" ]; then
if compileTest unix/db2 "DB2"; then
- if [ "$CFG_SQL_db2" = "auto" ]; then
- CFG_SQL_db2=plugin
- fi
+ CFG_SQL_db2=yes
else
if [ "$CFG_SQL_db2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "ODBC support cannot be enabled due to functionality tests!"
@@ -5008,9 +4244,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
ibase)
if [ "$CFG_SQL_ibase" != "no" ]; then
if compileTest unix/ibase "InterBase"; then
- if [ "$CFG_SQL_ibase" = "auto" ]; then
- CFG_SQL_ibase=plugin
- fi
+ CFG_SQL_ibase=yes
else
if [ "$CFG_SQL_ibase" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "InterBase support cannot be enabled due to functionality tests!"
@@ -5027,9 +4261,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
sqlite2)
if [ "$CFG_SQL_sqlite2" != "no" ]; then
if compileTest unix/sqlite2 "SQLite2"; then
- if [ "$CFG_SQL_sqlite2" = "auto" ]; then
- CFG_SQL_sqlite2=plugin
- fi
+ CFG_SQL_sqlite2=yes
else
if [ "$CFG_SQL_sqlite2" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "SQLite2 support cannot be enabled due to functionality tests!"
@@ -5048,25 +4280,21 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
SQLITE_AUTODETECT_FAILED="no"
if [ "$CFG_SQLITE" = "system" ]; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then
- QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
- QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
+ QMAKE_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
+ QMAKE_LIBS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
else
- QT_CFLAGS_SQLITE=
- QT_LFLAGS_SQLITE="-lsqlite3 -lz"
+ QMAKE_CFLAGS_SQLITE=
+ QMAKE_LIBS_SQLITE="-lsqlite3 -lz"
fi
- if compileTest unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $QT_CFLAGS_SQLITE; then
- if [ "$CFG_SQL_sqlite" = "auto" ]; then
- CFG_SQL_sqlite=plugin
- fi
+ if compileTest unix/sqlite "SQLite" $QMAKE_LIBS_SQLITE $QMAKE_CFLAGS_SQLITE; then
+ CFG_SQL_sqlite=yes
QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
else
SQLITE_AUTODETECT_FAILED="yes"
CFG_SQL_sqlite=no
fi
elif [ -f "$relpath/src/3rdparty/sqlite/sqlite3.h" ]; then
- if [ "$CFG_SQL_sqlite" = "auto" ]; then
- CFG_SQL_sqlite=plugin
- fi
+ CFG_SQL_sqlite=yes
else
SQLITE_AUTODETECT_FAILED="yes"
CFG_SQL_sqlite=no
@@ -5152,20 +4380,20 @@ fi
# runtime: no detection (cannot fail), load libdbus-1 at runtime
if [ "$CFG_DBUS" = "auto" ] || [ "$CFG_DBUS" = "linked" ]; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then
- QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null`
- QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null`
+ QMAKE_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null`
+ QMAKE_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null`
else
- QT_LIBS_DBUS="-ldbus-1"
+ QMAKE_LIBS_DBUS="-ldbus-1"
fi
- if compileTest unix/dbus "D-Bus" $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then
- QMakeVar set QT_LIBS_DBUS "$QT_LIBS_DBUS"
- QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
+ if compileTest unix/dbus "D-Bus" $QMAKE_CFLAGS_DBUS $QMAKE_LIBS_DBUS; then
+ QMakeVar set QMAKE_LIBS_DBUS "$QMAKE_LIBS_DBUS"
+ QMakeVar set QMAKE_CFLAGS_DBUS "$QMAKE_CFLAGS_DBUS"
# Try find correct host configuration for dbus tools when cross-compiling
if [ "$QT_CROSS_COMPILE" = "yes" ] && env -i PATH="$PATH" \
pkg-config --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then
- QT_CFLAGS_DBUS=`env -i PATH="$PATH" pkg-config --cflags dbus-1 2>/dev/null`
+ QMAKE_CFLAGS_DBUS=`env -i PATH="$PATH" pkg-config --cflags dbus-1 2>/dev/null`
fi
- QMakeVar set QT_HOST_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
+ QMakeVar set QT_HOST_CFLAGS_DBUS "$QMAKE_CFLAGS_DBUS"
CFG_DBUS=linked
else
# Failed to compile the test, so it's an error if CFG_DBUS is "linked"
@@ -5204,13 +4432,13 @@ fi
# auto-detect Glib support
if [ "$CFG_GLIB" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then
- QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null`
- QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
+ QMAKE_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null`
+ QMAKE_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
fi
- if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then
+ if compileTest unix/glib "Glib" $QMAKE_CFLAGS_GLIB $QMAKE_LIBS_GLIB; then
CFG_GLIB=yes
- QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB"
- QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB"
+ QMakeVar set QMAKE_CFLAGS_GLIB "$QMAKE_CFLAGS_GLIB"
+ QMakeVar set QMAKE_LIBS_GLIB "$QMAKE_LIBS_GLIB"
else
if [ "$CFG_GLIB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "Glib support cannot be enabled due to functionality tests!"
@@ -5228,15 +4456,14 @@ fi
# auto-detect GTK style support
if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then
- QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null`
- QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null`
- QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
+ QMAKE_CFLAGS_GTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null`
+ QMAKE_LIBS_GTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null`
fi
- if [ -n "$QT_CFLAGS_QGTK3" ] ; then
+ if [ -n "$QMAKE_CFLAGS_GTK3" ] ; then
CFG_GTK=yes
QT_CONFIG="$QT_CONFIG gtk3"
- QMakeVar set QT_CFLAGS_QGTK3 "$QT_CFLAGS_QGTK3"
- QMakeVar set QT_LIBS_QGTK3 "$QT_LIBS_QGTK3"
+ QMakeVar set QMAKE_CFLAGS_GTK3 "$QMAKE_CFLAGS_GTK3"
+ QMakeVar set QMAKE_LIBS_GTK3 "$QMAKE_LIBS_GTK3"
else
if [ "$CFG_GTK" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "GTK theme support cannot be enabled due to functionality tests!"
@@ -5275,13 +4502,13 @@ fi
# Auto-detect PulseAudio support
if [ "$CFG_PULSEAUDIO" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then
- QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
- QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
+ QMAKE_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
+ QMAKE_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null`
fi
- if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then
+ if compileTest unix/pulseaudio "PulseAudio" $QMAKE_CFLAGS_PULSEAUDIO $QMAKE_LIBS_PULSEAUDIO; then
CFG_PULSEAUDIO=yes
- QMakeVar set QT_CFLAGS_PULSEAUDIO "$QT_CFLAGS_PULSEAUDIO"
- QMakeVar set QT_LIBS_PULSEAUDIO "$QT_LIBS_PULSEAUDIO"
+ QMakeVar set QMAKE_CFLAGS_PULSEAUDIO "$QMAKE_CFLAGS_PULSEAUDIO"
+ QMakeVar set QMAKE_LIBS_PULSEAUDIO "$QMAKE_LIBS_PULSEAUDIO"
else
if [ "$CFG_PULSEAUDIO" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "PulseAudio support cannot be enabled due to functionality tests!"
@@ -5439,16 +4666,16 @@ fi
# auto-detect FontConfig support
if [ "$CFG_FONTCONFIG" != "no" ]; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then
- QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null`
- QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null`
+ QMAKE_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null`
+ QMAKE_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null`
else
- QT_CFLAGS_FONTCONFIG=
- QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
+ QMAKE_CFLAGS_FONTCONFIG=
+ QMAKE_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
fi
- if compileTest unix/fontconfig "FontConfig" $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
+ if compileTest unix/fontconfig "FontConfig" $QMAKE_CFLAGS_FONTCONFIG $QMAKE_LIBS_FONTCONFIG; then
QT_CONFIG="$QT_CONFIG fontconfig"
- QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG"
- QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG"
+ QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QMAKE_CFLAGS_FONTCONFIG"
+ QMakeVar set QMAKE_LIBS_FONTCONFIG "$QMAKE_LIBS_FONTCONFIG"
CFG_FONTCONFIG=yes
CFG_FREETYPE=system
else
@@ -5457,13 +4684,6 @@ if [ "$CFG_FONTCONFIG" != "no" ]; then
fi
-# Save these for a check later
-ORIG_CFG_XCB="$CFG_XCB"
-ORIG_CFG_EGLFS="$CFG_EGLFS"
-ORIG_CFG_DIRECTFB="$CFG_DIRECTFB"
-ORIG_CFG_LINUXFB="$CFG_LINUXFB"
-ORIG_CFG_MIRCLIENT="$CFG_MIRCLIENT"
-
if [ "$CFG_LIBUDEV" != "no" ]; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists libudev 2>/dev/null; then
QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
@@ -5591,12 +4811,12 @@ fi
if [ "$CFG_XINPUT2" != "no" ]; then
if compileTest x11/xinput2 "XInput2"; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xi 2>/dev/null; then
- QMAKE_LIBXI_VERSION_MAJOR=`$PKG_CONFIG --modversion xi 2>/dev/null | cut -d . -f 1`
- QMAKE_LIBXI_VERSION_MINOR=`$PKG_CONFIG --modversion xi 2>/dev/null | cut -d . -f 2`
- QMAKE_LIBXI_VERSION_PATCH=`$PKG_CONFIG --modversion xi 2>/dev/null | cut -d . -f 3`
- QMakeVar set QMAKE_LIBXI_VERSION_MAJOR "$QMAKE_LIBXI_VERSION_MAJOR"
- QMakeVar set QMAKE_LIBXI_VERSION_MINOR "$QMAKE_LIBXI_VERSION_MINOR"
- QMakeVar set QMAKE_LIBXI_VERSION_PATCH "$QMAKE_LIBXI_VERSION_PATCH"
+ QMAKE_XINPUT2_VERSION_MAJOR=`$PKG_CONFIG --modversion xi 2>/dev/null | cut -d . -f 1`
+ QMAKE_XINPUT2_VERSION_MINOR=`$PKG_CONFIG --modversion xi 2>/dev/null | cut -d . -f 2`
+ QMAKE_XINPUT2_VERSION_PATCH=`$PKG_CONFIG --modversion xi 2>/dev/null | cut -d . -f 3`
+ QMakeVar set QMAKE_XINPUT2_VERSION_MAJOR "$QMAKE_XINPUT2_VERSION_MAJOR"
+ QMakeVar set QMAKE_XINPUT2_VERSION_MINOR "$QMAKE_XINPUT2_VERSION_MINOR"
+ QMakeVar set QMAKE_XINPUT2_VERSION_PATCH "$QMAKE_XINPUT2_VERSION_PATCH"
fi
CFG_XINPUT2=yes
else
@@ -5957,21 +5177,6 @@ if [ "$CFG_MIRCLIENT" = "yes" ]; then
QT_CONFIG="$QT_CONFIG mirclient"
fi
-if [ "$XPLATFORM_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ] && [ "$XPLATFORM_QNX" = "no" ] && [ "$XPLATFORM_ANDROID" = "no" ] && [ "$XPLATFORM_HAIKU" = "no" ] && [ "$XPLATFORM_INTEGRITY" = "no" ]; then
- if [ "$CFG_XCB" = "no" ] && [ "$CFG_EGLFS" = "no" ] && [ "$CFG_DIRECTFB" = "no" ] && [ "$CFG_LINUXFB" = "no" ] && [ "$CFG_MIRCLIENT" = "no" ]; then
- if [ "$QPA_PLATFORM_GUARD" = "yes" ] &&
- ( [ "$ORIG_CFG_XCB" = "auto" ] || [ "$ORIG_CFG_EGLFS" = "auto" ] || [ "$ORIG_CFG_DIRECTFB" = "auto" ] || [ "$ORIG_CFG_LINUXFB" = "auto" ] || [ "$ORIG_CFG_MIRCLIENT" = "auto" ] ); then
- echo "No QPA platform plugin enabled!"
- echo " If you really want to build without a QPA platform plugin you must pass"
- echo " -no-qpa-platform-guard to configure. Doing this will"
- echo " produce a Qt that can not run GUI applications."
- echo " The dependencies needed for xcb to build are listed in"
- echo " src/plugins/platforms/xcb/README"
- exit 1
- fi
-fi
- fi
-
# double-conversion support
if [ "$CFG_DOUBLECONVERSION" = "no" ]; then
if ! compileTest common/xlocalescanprint "XLocaleScanPrint"; then
@@ -6213,44 +5418,6 @@ if [ "$CFG_PCRE" != "qt" ]; then
fi
fi
-# detect OpenVG support
-if [ "$CFG_OPENVG" != "no" ]; then
- if compileTest unix/openvg "OpenVG"; then
- if [ "$CFG_OPENVG" = "auto" ]; then
- CFG_OPENVG=yes
- fi
- elif compileTest unix/openvg "OpenVG" -config openvg_on_opengl; then
- if [ "$CFG_OPENVG" = "auto" ]; then
- CFG_OPENVG=yes
- fi
- CFG_OPENVG_ON_OPENGL=yes
- elif compileTest unix/openvg "OpenVG (lc includes)" -config lower_case_includes; then
- if [ "$CFG_OPENVG" = "auto" ]; then
- CFG_OPENVG=yes
- fi
- CFG_OPENVG_LC_INCLUDES=yes
- elif compileTest unix/openvg "OpenVG (lc includes)" -config "openvg_on_opengl lower_case_includes"; then
- if [ "$CFG_OPENVG" = "auto" ]; then
- CFG_OPENVG=yes
- fi
- CFG_OPENVG_LC_INCLUDES=yes
- CFG_OPENVG_ON_OPENGL=yes
- else
- if [ "$CFG_OPENVG" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
- echo "$CFG_OPENVG was specified for OpenVG but cannot be enabled due to functionality tests!"
- echo " Turn on verbose messaging (-v) to $0 to see the final report."
- echo " If you believe this message is in error you may use the continue"
- echo " switch (-continue) to $0 to continue."
- exit 101
- else
- CFG_OPENVG=no
- fi
- fi
- if [ "$CFG_OPENVG" = "yes" ] && compileTest unix/shivavg "ShivaVG"; then
- CFG_OPENVG_SHIVA=yes
- fi
-fi
-
if [ "$CFG_ALSA" = "auto" ]; then
if compileTest unix/alsa "alsa"; then
CFG_ALSA=yes
@@ -6299,11 +5466,6 @@ elif [ "$CFG_GSTREAMER" = "1.0" ]; then
fi
fi
-if [ "$CFG_LARGEFILE" != "yes" ] && [ "$XPLATFORM_MINGW" = "yes" ]; then
- echo "Warning: largefile support cannot be disabled for win32."
- CFG_LARGEFILE="yes"
-fi
-
# Detect DirectWrite 2 support on Windows
if [ "$CFG_DIRECTWRITE" = "no" ]; then
CFG_DIRECTWRITE2=no
@@ -6329,7 +5491,7 @@ if [ "$CFG_STDCXX" != "c++11" ]; then
fi
fi
-if [ "$CFG_ATOMIC64" = "libatomic" ]; then
+if [ "$CFG_STD_ATOMIC64" = "libatomic" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG atomic64-libatomic"
fi
@@ -6387,23 +5549,6 @@ if [ "$CFG_EGLFS_VIV" = "yes" ]; then
fi
fi
-# enable openvg
-if [ "$CFG_OPENVG" = "no" ]; then
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENVG"
-else
- QT_CONFIG="$QT_CONFIG openvg"
- if [ "$CFG_OPENVG_LC_INCLUDES" = "yes" ]; then
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LOWER_CASE_VG_INCLUDES"
- fi
- if [ "$CFG_OPENVG_ON_OPENGL" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG openvg_on_opengl"
- fi
- if [ "$CFG_OPENVG_SHIVA" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG shivavg"
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SHIVAVG"
- fi
-fi
-
# enable opengl
if [ "$CFG_OPENGL" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL"
@@ -6499,9 +5644,7 @@ if [ "$CFG_LIBJPEG" = "no" ]; then
elif [ "$CFG_LIBJPEG" = "system" ]; then
QT_CONFIG="$QT_CONFIG system-jpeg"
fi
-if [ "$CFG_JPEG" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-jpeg"
-elif [ "$CFG_JPEG" = "yes" ]; then
+if [ "$CFG_JPEG" = "yes" ]; then
QT_CONFIG="$QT_CONFIG jpeg"
fi
if [ "$CFG_LIBPNG" = "no" ]; then
@@ -6510,36 +5653,28 @@ fi
if [ "$CFG_LIBPNG" = "system" ]; then
QT_CONFIG="$QT_CONFIG system-png"
fi
-if [ "$CFG_PNG" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-png"
-elif [ "$CFG_PNG" = "yes" ]; then
+if [ "$CFG_PNG" = "yes" ]; then
QT_CONFIG="$QT_CONFIG png"
fi
-if [ "$CFG_GIF" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-gif"
-elif [ "$CFG_GIF" = "yes" ]; then
+if [ "$CFG_GIF" = "yes" ]; then
QT_CONFIG="$QT_CONFIG gif"
fi
-if [ "$CFG_DOUBLECONVERSION" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-doubleconversion"
-elif [ "$CFG_DOUBLECONVERSION" = "system" ]; then
- QT_CONFIG="$QT_CONFIG system-doubleconversion"
+if [ "$CFG_DOUBLECONVERSION" = "system" ]; then
+ QT_CONFIG="$QT_CONFIG doubleconversion system-doubleconversion"
else
QT_CONFIG="$QT_CONFIG doubleconversion"
fi
if [ "$CFG_FREETYPE" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-freetype"
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE"
elif [ "$CFG_FREETYPE" = "system" ]; then
- QT_CONFIG="$QT_CONFIG system-freetype"
+ QT_CONFIG="$QT_CONFIG freetype system-freetype"
else
QT_CONFIG="$QT_CONFIG freetype"
fi
if [ "$CFG_HARFBUZZ" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-harfbuzz"
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_HARFBUZZ"
elif [ "$CFG_HARFBUZZ" = "system" ]; then
- QT_CONFIG="$QT_CONFIG system-harfbuzz"
+ QT_CONFIG="$QT_CONFIG harfbuzz system-harfbuzz"
else
QT_CONFIG="$QT_CONFIG harfbuzz"
fi
@@ -6558,18 +5693,16 @@ fi
if [ "$XPLATFORM_MAC" = "yes" ]; then
#On Mac we implicitly link against libz, so we
#never use the 3rdparty stuff.
- [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
+ CFG_SYSTEM_ZLIB=yes
fi
-if [ "$CFG_ZLIB" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG zlib"
-elif [ "$CFG_ZLIB" = "system" ]; then
+if [ "$CFG_SYSTEM_ZLIB" = "yes" ]; then
QT_CONFIG="$QT_CONFIG system-zlib"
fi
[ "$CFG_MTDEV" = "yes" ] && QT_CONFIG="$QT_CONFIG mtdev"
[ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis"
[ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups"
-[ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv"
+[ "$CFG_ICONV" != "no" ] && QT_CONFIG="$QT_CONFIG iconv"
[ "$CFG_ICONV" = "sun" ] && QT_CONFIG="$QT_CONFIG sun-libiconv"
[ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv"
[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib"
@@ -6674,137 +5807,8 @@ if [ "$CFG_PCRE" = "qt" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG pcre"
fi
-#
-# Some Qt modules are too advanced in C++ for some old compilers
-# Detect here the platforms where they are known to work.
-#
-# See Qt documentation for more information on which features are
-# supported and on which compilers.
-#
-canBuildQtConcurrent="yes"
-
-case "$XPLATFORM" in
- hpux-g++*)
- # PA-RISC's assembly is too limited
- # gcc 3.4 on that platform can't build QtXmlPatterns
- # the assembly it generates cannot be compiled
-
- # Check gcc's version
- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
- 4*)
- ;;
- 3.4*)
- canBuildQtXmlPatterns="no"
- ;;
- *)
- canBuildWebKit="no"
- canBuildQtXmlPatterns="no"
- ;;
- esac
- ;;
- unsupported/vxworks-*-g++*)
- canBuildWebKit="no"
- ;;
- unsupported/vxworks-*-dcc*)
- canBuildWebKit="no"
- canBuildQtXmlPatterns="no"
- ;;
- *-g++*)
- # Check gcc's version
- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
- 4*|3.4*)
- ;;
- 3.3*)
- canBuildWebKit="no"
- ;;
- *)
- canBuildWebKit="no"
- canBuildQtXmlPatterns="no"
- ;;
- esac
- ;;
- solaris-cc*)
- # Check the compiler version
- case `${QMAKE_CONF_COMPILER} -V 2>&1 | $AWK '{print $4}'` in
- 5.[012345678])
- canBuildWebKit="no"
- canBuildQtXmlPatterns="no"
- canBuildQtConcurrent="no"
- ;;
- 5.*)
- canBuildWebKit="no"
- canBuildQtConcurrent="no"
- ;;
- esac
- ;;
- hpux-acc*)
- canBuildWebKit="no"
- canBuildQtXmlPatterns="no"
- canBuildQtConcurrent="no"
- ;;
- hpuxi-acc*)
- canBuildWebKit="no"
- ;;
- aix-xlc*)
- # Get the xlC version
- cat > xlcver.c <<EOF
-#include <stdio.h>
-int main()
-{
- printf("%d.%d\n", __xlC__ >> 8, __xlC__ & 0xFF);
- return 0;
-}
-EOF
- xlcver=
- if ${QMAKE_CONF_COMPILER} -o xlcver xlcver.c >/dev/null 2>/dev/null; then
- xlcver=`./xlcver 2>/dev/null`
- rm -f ./xlcver
- fi
- if [ "$OPT_VERBOSE" = "yes" ]; then
- if [ -n "$xlcver" ]; then
- echo Found IBM xlC version: $xlcver.
- else
- echo Could not determine IBM xlC version, assuming oldest supported.
- fi
- fi
-
- case "$xlcver" in
- [123456].*)
- canBuildWebKit="no"
- canBuildQtXmlPatterns="no"
- canBuildQtConcurrent="no"
- ;;
- *)
- canBuildWebKit="no"
- canBuildQtConcurrent="no"
- ;;
- esac
- ;;
- irix-cc*)
- canBuildWebKit="no"
- canBuildQtConcurrent="no"
- ;;
-esac
-
-if [ "$CFG_GUI" = "no" ]; then
- # WebKit requires Qt GUI
- canBuildWebKit="no"
-fi
-
-if [ "$CFG_SHARED" = "no" ]; then
- echo
- echo "WARNING: Using static linking will disable the WebKit module."
- echo
- canBuildWebKit="no"
-fi
-
CFG_CONCURRENT="yes"
-if [ "$canBuildQtConcurrent" = "no" ]; then
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT"
- CFG_CONCURRENT="no"
-else
- QT_CONFIG="$QT_CONFIG concurrent"
-fi
+QT_CONFIG="$QT_CONFIG concurrent"
# ### Vestige
if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
@@ -6883,17 +5887,6 @@ cat <<EOF
EOF
-case "$CFG_QCONFIG" in
-full)
- echo "/* Everything */"
- ;;
-*)
- echo "#ifndef QT_BOOTSTRAPPED"
- cat "$CFG_QCONFIG_PATH"
- echo "#endif"
- ;;
-esac
-
echo '/* Compile time features */'
[ '!' -z "$LicenseKeyExt" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKeyExt\""
@@ -6920,7 +5913,7 @@ if [ "$CFG_FRAMEWORK" = "yes" ]; then
echo "#define QT_MAC_FRAMEWORK_BUILD"
fi
-if [ "$CFG_ATOMIC64" = "no" ]; then
+if [ "$CFG_STD_ATOMIC64" = "no" ]; then
echo "#define QT_NO_STD_ATOMIC64"
fi
@@ -6958,26 +5951,17 @@ QCONFIG_FLAGS="$QCONFIG_FLAGS"
# Add turned on SQL drivers
for DRIVER in $CFG_SQL_AVAILABLE; do
eval "VAL=\$CFG_SQL_$DRIVER"
- case "$VAL" in
- qt)
- ONDRIVER=`echo $DRIVER | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SQL_$ONDRIVER"
+ if [ "$VAL" = "yes" ]; then
SQL_DRIVERS="$SQL_DRIVERS $DRIVER"
- ;;
- plugin)
- SQL_PLUGINS="$SQL_PLUGINS $DRIVER"
- ;;
- esac
+ fi
done
QMakeVar set sql-drivers "$SQL_DRIVERS"
-QMakeVar set sql-plugins "$SQL_PLUGINS"
# Add other configuration options to the qconfig.h file
-[ "$CFG_GIF" = "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1"
+[ "$CFG_GIF" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_GIF"
[ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG"
[ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG"
-[ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB"
[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
[ "$CFG_LIBPROXY" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_LIBPROXY"
@@ -7003,19 +5987,10 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
[ "$CFG_SM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER"
[ "$CFG_TSLIB" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TSLIB"
-[ "$CFG_XCURSOR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR"
-[ "$CFG_XFIXES" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES"
[ "$CFG_FONTCONFIG" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FONTCONFIG"
[ "$CFG_XKB" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB"
-[ "$CFG_XRANDR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR"
[ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER"
-[ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM"
-[ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE"
-[ "$CFG_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC"
-[ "$CFG_XCURSOR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR"
-[ "$CFG_XFIXES" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XFIXES"
-[ "$CFG_XRANDR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XRANDR"
[ "$CFG_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA"
[ "$CFG_PULSEAUDIO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO"
[ "$CFG_COREWLAN" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN"
@@ -7190,7 +6165,6 @@ if [ -n "$CFG_SYSROOT" ] && [ "$CFG_GCC_SYSROOT" = "yes" ]; then
echo "}"
echo
fi
-echo "QT_COMPILER_STDCXX = $CFG_STDCXX_DEFAULT"
if [ -n "$QT_GCC_MAJOR_VERSION" ]; then
echo "QT_GCC_MAJOR_VERSION = $QT_GCC_MAJOR_VERSION"
echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION"
@@ -7248,7 +6222,6 @@ done
if [ -n "$DISABLED_FEATURES" ]; then
echo "QT_NO_DEFINES = $DISABLED_FEATURES"
fi
-echo "QT_QCONFIG_PATH = ${CFG_QCONFIG_PATH#$relpath/src/corelib/global/}"
cat <<EOF
host_build {
@@ -7259,29 +6232,29 @@ host_build {
EOF
echo "QT_COORD_TYPE = $CFG_QREAL"
-if [ -n "$QT_CFLAGS_PSQL" ]; then
- echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL"
+if [ -n "$QMAKE_CFLAGS_PSQL" ]; then
+ echo "QMAKE_CFLAGS_PSQL = $QMAKE_CFLAGS_PSQL"
fi
-if [ -n "$QT_LFLAGS_PSQL" ]; then
- echo "QT_LFLAGS_PSQL = $QT_LFLAGS_PSQL"
+if [ -n "$QMAKE_LIBS_PSQL" ]; then
+ echo "QMAKE_LIBS_PSQL = $QMAKE_LIBS_PSQL"
fi
-if [ -n "$QT_CFLAGS_MYSQL" ]; then
- echo "QT_CFLAGS_MYSQL = $QT_CFLAGS_MYSQL"
+if [ -n "$QMAKE_CFLAGS_MYSQL" ]; then
+ echo "QMAKE_CFLAGS_MYSQL = $QMAKE_CFLAGS_MYSQL"
fi
-if [ -n "$QT_LFLAGS_MYSQL" ]; then
- echo "QT_LFLAGS_MYSQL = $QT_LFLAGS_MYSQL"
+if [ -n "$QMAKE_LIBS_MYSQL" ]; then
+ echo "QMAKE_LIBS_MYSQL = $QMAKE_LIBS_MYSQL"
fi
-if [ -n "$QT_CFLAGS_SQLITE" ]; then
- echo "QT_CFLAGS_SQLITE = $QT_CFLAGS_SQLITE"
+if [ -n "$QMAKE_CFLAGS_SQLITE" ]; then
+ echo "QMAKE_CFLAGS_SQLITE = $QMAKE_CFLAGS_SQLITE"
fi
-if [ -n "$QT_LFLAGS_SQLITE" ]; then
- echo "QT_LFLAGS_SQLITE = $QT_LFLAGS_SQLITE"
+if [ -n "$QMAKE_LIBS_SQLITE" ]; then
+ echo "QMAKE_LIBS_SQLITE = $QMAKE_LIBS_SQLITE"
fi
-if [ -n "$QT_LFLAGS_ODBC" ]; then
- echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC"
+if [ -n "$QMAKE_LIBS_ODBC" ]; then
+ echo "QMAKE_LIBS_ODBC = $QMAKE_LIBS_ODBC"
fi
-if [ -n "$QT_LFLAGS_TDS" ]; then
- echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS"
+if [ -n "$QMAKE_LIBS_TDS" ]; then
+ echo "QMAKE_LIBS_TDS = $QMAKE_LIBS_TDS"
fi
#dump in the OPENSSL_LIBS info
@@ -7419,7 +6392,6 @@ report_support " Qt D-Bus ..............." "$CFG_DBUS" runtime "loading dbus-1
report_support " Qt Concurrent .........." "$CFG_CONCURRENT"
report_support " Qt GUI ................." "$CFG_GUI"
report_support " Qt Widgets ............." "$CFG_WIDGETS"
-report_support " Large File ............." "$CFG_LARGEFILE"
report_support " QML debugging .........." "$CFG_QML_DEBUG"
report_support " Use system proxies ....." "$CFG_SYSTEM_PROXIES"
@@ -7466,7 +6438,6 @@ report_support " NIS ...................." "$CFG_NIS"
report_support " OpenGL / OpenVG:"
report_support " EGL .................." "$CFG_EGL"
report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+"
-report_support " OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native"
report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy"
if [ -n "$PKG_CONFIG" ]; then
report_support " pkg-config ............. yes"
@@ -7493,16 +6464,10 @@ report_support " XCB .................." "$CFG_XCB" system "system library" q
if [ "$CFG_XCB" != "no" ]; then
report_support " EGL on X ..........." "$CFG_EGL_X"
report_support " GLX ................" "$CFG_XCB_GLX"
- report_support " MIT-SHM ............" "$CFG_MITSHM"
report_support " Xcb-Xlib ..........." "$CFG_XCB_XLIB"
- report_support " Xcursor ............" "$CFG_XCURSOR" runtime "loaded at runtime"
- report_support " Xfixes ............." "$CFG_XFIXES" runtime "loaded at runtime"
report_support " Xi2 ................" "$CFG_XINPUT2" runtime "loaded at runtime"
- report_support " Xrandr ............." "$CFG_XRANDR" runtime "loaded at runtime"
report_support " Xrender ............" "$CFG_XRENDER"
report_support " XKB ................" "$CFG_XKB"
- report_support " XShape ............." "$CFG_XSHAPE"
- report_support " XSync .............." "$CFG_XSYNC"
fi
report_support " Session management ....." "$CFG_SM"
if [ "$XPLATFORM_QNX" = "yes" ]; then
@@ -7512,20 +6477,20 @@ if [ "$XPLATFORM_QNX" = "yes" ]; then
report_support " LGMON .................." "$CFG_LGMON"
fi
report_support " SQL drivers:"
-report_support " DB2 .................." "$CFG_SQL_db2" plugin "plugin" yes "built into QtSql"
-report_support " InterBase ............" "$CFG_SQL_ibase" plugin "plugin" yes "built into QtSql"
-report_support " MySQL ................" "$CFG_SQL_mysql" plugin "plugin" yes "built into QtSql"
-report_support " OCI .................." "$CFG_SQL_oci" plugin "plugin" yes "built into QtSql"
-report_support " ODBC ................." "$CFG_SQL_odbc" plugin "plugin" yes "built into QtSql"
-report_support " PostgreSQL ..........." "$CFG_SQL_psql" plugin "plugin" yes "built into QtSql"
-report_support " SQLite 2 ............." "$CFG_SQL_sqlite2" plugin "plugin" yes "built into QtSql"
+report_support " DB2 .................." "$CFG_SQL_db2"
+report_support " InterBase ............" "$CFG_SQL_ibase"
+report_support " MySQL ................" "$CFG_SQL_mysql"
+report_support " OCI .................." "$CFG_SQL_oci"
+report_support " ODBC ................." "$CFG_SQL_odbc"
+report_support " PostgreSQL ..........." "$CFG_SQL_psql"
+report_support " SQLite 2 ............." "$CFG_SQL_sqlite2"
report_support_plugin " SQLite ..............." "$CFG_SQL_sqlite" "$CFG_SQLITE" QtSql
-report_support " TDS .................." "$CFG_SQL_tds" plugin "plugin" yes "built into QtSql"
+report_support " TDS .................." "$CFG_SQL_tds"
report_support " tslib .................." "$CFG_TSLIB"
report_support " udev ..................." "$CFG_LIBUDEV"
report_support " xkbcommon-x11..........." "$CFG_XKBCOMMON" system "system library" qt "bundled copy, XKB config root: $CFG_XKB_CONFIG_ROOT"
report_support " xkbcommon-evdev........." "$CFG_XKBCOMMON_EVDEV"
-report_support " zlib ..................." "$CFG_ZLIB" system "system library" yes "bundled copy"
+report_support " zlib ..................." "$CFG_SYSTEM_ZLIB" yes "system library" no "bundled copy"
echo
@@ -7565,6 +6530,14 @@ if [ "$CFG_RELEASE_TOOLS" = "yes" -a \( "$CFG_DEBUG" = "no" -o "$CFG_DEBUG_RELEA
echo "NOTE: -optimized-tools is not useful in -release mode."
echo
fi
+if [ "$CFG_GUI" = "yes" ] && [ "$XPLATFORM_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ] && [ "$XPLATFORM_QNX" = "no" ] && [ "$XPLATFORM_ANDROID" = "no" ] && [ "$XPLATFORM_HAIKU" = "no" ] && [ "$XPLATFORM_INTEGRITY" = "no" ]; then
+ if [ "$CFG_XCB" = "no" ] && [ "$CFG_EGLFS" = "no" ] && [ "$CFG_DIRECTFB" = "no" ] && [ "$CFG_LINUXFB" = "no" ] && [ "$CFG_MIRCLIENT" = "no" ]; then
+ echo
+ echo "No QPA platform plugin enabled! This will"
+ echo "produce a Qt that cannot run GUI applications."
+ echo
+ fi
+fi
exec 1>&3 3>&- # restore stdout
cat $outpath/config.summary # display config feedback to user
@@ -7600,76 +6573,6 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
) || exit
#-------------------------------------------------------------------------------
-# check for platforms that we don't yet know about
-#-------------------------------------------------------------------------------
-if [ "$CFG_ARCH" = "unknown" ]; then
-cat <<EOF
-
- NOTICE: configure was unable to determine the architecture
- for the $XQMAKESPEC target.
-
- Qt will not use a specialized implementation for any atomic
- operations. Instead a generic implemention based on either GCC
- intrinsics or C++11 std::atomic<T> will be used (when
- available). The generic implementations are generally as fast
- as and always as safe as a specialized implementation.
-
- If no generic implementation is available, Qt will use a
- fallback UNIX implementation which uses a single
- pthread_mutex_t to protect all atomic operations. This
- implementation is the slow (but safe) fallback implementation
- for architectures Qt does not yet support.
-EOF
-fi
-
-#-------------------------------------------------------------------------------
-# check if the user passed the -no-zlib option, which is no longer supported
-#-------------------------------------------------------------------------------
-if [ -n "$ZLIB_FORCED" ]; then
- which_zlib="supplied"
- if [ "$CFG_ZLIB" = "system" ]; then
- which_zlib="system"
- fi
-
-cat <<EOF
-
- NOTICE: The -no-zlib option was supplied but is no longer
- supported.
-
- Qt now requires zlib support in all builds, so the -no-zlib
- option was ignored. Qt will be built using the $which_zlib
- zlib.
-EOF
-fi
-
-#-------------------------------------------------------------------------------
-# check if the user passed the obsoleted -wayland or -no-wayland flag
-#-------------------------------------------------------------------------------
-if [ "$CFG_OBSOLETE_WAYLAND" = "yes" ]; then
-cat <<EOF
-
- NOTICE: The -wayland and -no-wayland flags are now obsolete
-
- All configuring of QtWayland plugin and QtCompositor happens in the module
-EOF
-fi
-
-#-------------------------------------------------------------------------------
-# check if the user passed the obsoleted -arch or -host-arch options
-#-------------------------------------------------------------------------------
-if [ "$OPT_OBSOLETE_HOST_ARG" = "yes" ]; then
-cat <<EOF
-
- NOTICE: The -arch and -host-arch options are obsolete.
-
- Qt now detects the target and host architectures based on compiler
- output. Qt will be built using $CFG_ARCH for the target architecture
- and $CFG_HOST_ARCH for the host architecture (note that these two
- will be the same unless you are cross-compiling).
-EOF
-fi
-
-#-------------------------------------------------------------------------------
# finally save the executed command to another script
#-------------------------------------------------------------------------------
if [ `basename $0` != "config.status" ]; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 01:53:12 +0000