1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unsued code

Browse Source 
This section did set some canBuild* variables based on compiler
checks. Apart from canBuildQtConcurrent, the variables never
got used. In the QtConcurrent case, the answer will anyway always
be yes, since we require a c++11 compliant compiler nowadays.

Change-Id: I660b40e96a657f6fa4d32f6b680adf44e70509c9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-02-17 12:53:57 +01:00
parent de7dfc76da
commit 34adce75c4
1 changed files with 1 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
configure vendored
View File

@ -6650,137 +6650,8 @@ if [ "$CFG_PCRE" = "qt" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG pcre" QMAKE_CONFIG="$QMAKE_CONFIG pcre"
fi 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" CFG_CONCURRENT="yes"
if [ "$canBuildQtConcurrent" = "no" ]; then QT_CONFIG="$QT_CONFIG concurrent"
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT"
CFG_CONCURRENT="no"
else
QT_CONFIG="$QT_CONFIG concurrent"
fi
# ### Vestige # ### Vestige
if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then