From 2a32fc38dd7c3f69654fa92791da62a143f4f65a Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 4 Dec 2013 17:05:06 +0100 Subject: Fix configure option display This got messed up in merge 4a8273a6fc2e741e811cf5dabc9a3c240306cf7f thanks to automatic conflict resolution. Change-Id: Idbe1545c7d3ee0580bf2c1381dd3e8b2191dc3e8 Reviewed-by: Michael Brasser --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 2bc17274c1..6cf49fccd6 100755 --- a/configure +++ b/configure @@ -2494,6 +2494,9 @@ QNX/Blackberry options: -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. + MacOS/iOS options: -Fstring ........... Add an explicit framework path. @@ -3758,8 +3761,6 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then fi #------------------------------------------------------------------------------- - -no-imf ............ Do not compile with imf support. - -imf ............... Compile with imf support. # generate qconfig.cpp #------------------------------------------------------------------------------- [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" -- cgit v1.2.3