diff --git a/configure b/configure
index b6c9b462f2..b426aa2085 100755
--- a/configure
+++ b/configure
@@ -711,109 +711,6 @@ setBootstrapVariable()
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
}
-# build qmake
- echo "Creating qmake..."
- mkdir -p "$outpath/qmake" || exit
-
- in_mkfile=$relpath/qmake/Makefile.unix
- mkfile=$outpath/qmake/Makefile
- if [ -f "$mkfile" ]; then
- [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile"
- rm -f "$mkfile"
- fi
-
- echo "########################################################################" > "$mkfile"
- echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"
- echo "########################################################################" >> "$mkfile"
- EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"
- EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)"
-
- [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
- setBootstrapVariable QMAKE_CXXFLAGS
- setBootstrapVariable QMAKE_CXXFLAGS_CXX11
- setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
- setBootstrapVariable QMAKE_LFLAGS
- setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
-
- if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
- setBootstrapVariable QMAKE_CXXFLAGS_RELEASE
- EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
- else
- setBootstrapVariable QMAKE_CXXFLAGS_DEBUG
- EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
- fi
-
- adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
- adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
- adjqmakespec=`echo "$QMAKESPEC" | sed 's/ /\\\\\\\\ /g'`
-
- echo "BUILD_PATH = .." >> "$mkfile"
- echo "SOURCE_PATH = $adjrelpath" >> "$mkfile"
- if [ -e "$relpath/.git" ]; then
- echo 'INC_PATH = $(BUILD_PATH)/include' >> "$mkfile"
- else
- echo 'INC_PATH = $(SOURCE_PATH)/include' >> "$mkfile"
- fi
- echo "QMAKESPEC = $adjqmakespec" >> "$mkfile"
- echo "QT_VERSION = $QT_VERSION" >> "$mkfile"
- echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile"
- echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile"
- echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile"
- echo "CONFIG_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile"
- echo "CONFIG_LFLAGS = $EXTRA_LFLAGS" >> "$mkfile"
- echo "RM_F = rm -f" >> "$mkfile"
- echo "RM_RF = rm -rf" >> "$mkfile"
-
- case `basename "$PLATFORM"` in
- win32-*g++*)
- cat "$in_mkfile.win32" >> "$mkfile"
- ;;
- *)
- cat "$in_mkfile.unix" >> "$mkfile"
- if [ "$BUILD_ON_MAC" = "yes" ]; then
- cat "$in_mkfile.macos" >> "$mkfile"
- fi
- ;;
- esac
- echo >>"$mkfile"
-
- if [ "$BUILD_ON_MAC" = "yes" ]; then
- echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile"
- for arch in $QMAKE_APPLE_DEVICE_ARCHS; do
- echo "EXTRA_CXXFLAGS += -arch $arch" >> "$mkfile"
- echo "EXTRA_LFLAGS += -arch $arch" >> "$mkfile"
- done
- cat "$in_mkfile" >> "$mkfile"
- echo "-include \$(notdir \$(DEPEND_SRC:%.cpp=%.d))" >> "$mkfile"
- else
- cat "$in_mkfile" >> "$mkfile"
- if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
- (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
- sed 's,^.*/\([^/]*.o\):,\1:,g' "$mkfile" >"$mkfile.tmp"
- sed "s,$outpath,$adjoutpath,g" "$mkfile.tmp" >"$mkfile"
- rm "$mkfile.tmp"
- fi
- fi
-
- if [ "$OPT_VERBOSE" = yes ]; then
- # Show the output of make
- (cd "$outpath/qmake"; "$MAKE") || exit 2
- else
- # Hide the output of make
- # Use bash to print dots, if we have it, and stdout is a tty.
- if test -t 1 && $WHICH bash > /dev/null 2>/dev/null; then
- bash -c 'set -o pipefail
- cd "$0/qmake"; "$1" | while read line; do
- builtin echo -n .
- done' "$outpath" "$MAKE" || exit 2
- else
- (cd "$outpath/qmake"; "$MAKE" -s) || exit 2
- fi
- echo "Done."
- fi
-
#-------------------------------------------------------------------------------
# create a qt.conf for the Qt build tree itself
#-------------------------------------------------------------------------------