diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-04 17:05:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-06 15:06:47 +0100 |
| commit | 2a32fc38dd7c3f69654fa92791da62a143f4f65a (patch) | |
| tree | 73f9c239ce3f7dc23e6be34faac4d8d09bb0f083 /configure | |
| parent | e4af81f13a9fd6b64350190c86bf4fb430ce7329 (diff) | |
Fix configure option display
This got messed up in merge 4a8273a6fc2e741e811cf5dabc9a3c240306cf7f
thanks to automatic conflict resolution.
Change-Id: Idbe1545c7d3ee0580bf2c1381dd3e8b2191dc3e8
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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" |