Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbaseqt-v5.0.0-alpha1

1 files changed, 5 insertions, 8 deletions

diff --git a/configure b/configure
index d1040ba510..99a5173b87 100755
--- a/configure
+++ b/configure
@@ -2538,15 +2538,10 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
     fi
 fi
 
-SYSROOT_FLAG=
 if [ -n "$CFG_SYSROOT" ]; then
-    if compilerSupportsFlag --sysroot="$CFG_SYSROOT"; then
-	[ "$OPT_VERBOSE" = "yes" ] && echo "Setting sysroot to: $CFG_SYSROOT"
-	SYSROOT_FLAG="--sysroot=$CFG_SYSROOT"
-    else
-	echo >&2 "The compiler doesn't support the --sysroot flag, I can't set the sysroot"
-	exit 1
-    fi
+    SYSROOT_FLAG="--sysroot=$CFG_SYSROOT"
+else
+    SYSROOT_FLAG=
 fi
 export SYSROOT_FLAG    # used by config.tests/unix/compile.test
 
@@ -3185,6 +3180,8 @@ Additional options:
 
     -xplatform target ... The target platform when cross-compiling.
 
+    -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot.
+
     -no-feature-<feature> Do not compile in <feature>.
     -feature-<feature> .. Compile in <feature>. The available features
                           are described in src/corelib/global/qfeatures.txt