summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-07-12 10:14:46 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-12 10:14:46 (GMT)
commit80ad34046e2d3d0b8bd5d8346cb1edb0c83c1585 (patch)
tree671f26cc525a1da205c9b9acf658669177467eb3 /tools
parent156193223ee9d58da66817ae6ffc0174bdf34e5b (diff)
downloadQt-80ad34046e2d3d0b8bd5d8346cb1edb0c83c1585.zip
Qt-80ad34046e2d3d0b8bd5d8346cb1edb0c83c1585.tar.gz
Qt-80ad34046e2d3d0b8bd5d8346cb1edb0c83c1585.tar.bz2
fixed built-in jpeg and tiff in configure.exe, QTBUG-12093
Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp4
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")