diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-07-12 10:14:46 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-16 08:02:32 (GMT) |
| commit | 863ce8383d7c3b6ac825d4cec1da90f8d12d439b (patch) | |
| tree | 7c320ad3b360420c0016b1bed90d7288a0b9e1d5 | |
| parent | cd2f294b9817ce0462687d47e6dce7cab11c9b61 (diff) | |
| download | Qt-863ce8383d7c3b6ac825d4cec1da90f8d12d439b.zip Qt-863ce8383d7c3b6ac825d4cec1da90f8d12d439b.tar.gz Qt-863ce8383d7c3b6ac825d4cec1da90f8d12d439b.tar.bz2 | |
fixed built-in jpeg and tiff in configure.exe, QTBUG-12093
Merge-request: 740
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 80ad34046e2d3d0b8bd5d8346cb1edb0c83c1585)
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0c450f0..d3dec3c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2440,6 +2440,8 @@ void Configure::generateOutputVars() if (dictionary[ "TIFF" ] == "no") qtConfig += "no-tiff"; + else if (dictionary[ "TIFF" ] == "yes") + qtConfig += "tiff"; else if (dictionary[ "TIFF" ] == "plugin") qmakeFormatPlugins += "tiff"; if (dictionary[ "LIBTIFF" ] == "system") @@ -2447,6 +2449,8 @@ void Configure::generateOutputVars() if (dictionary[ "JPEG" ] == "no") qtConfig += "no-jpeg"; + else if (dictionary[ "JPEG" ] == "yes") + qtConfig += "jpeg"; else if (dictionary[ "JPEG" ] == "plugin") qmakeFormatPlugins += "jpeg"; if (dictionary[ "LIBJPEG" ] == "system") |