AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix configure option display

Browse Source 
This got messed up in merge 4a8273a6fc
thanks to automatic conflict resolution.

Change-Id: Idbe1545c7d3ee0580bf2c1381dd3e8b2191dc3e8
Reviewed-by: Michael Brasser <michael.brasser@live.com>
This commit is contained in:
Frederik Gladhorn 2013-12-04 17:05:06 +01:00 committed by The Qt Project
parent e4af81f13a
commit 2a32fc38dd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -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"