summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2010-07-19 10:16:43 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2010-07-19 10:16:43 (GMT)
commita545e26e1183133f4a66cb9a3bcd9051e2d77894 (patch)
treec9e8c627a4619717189b71a060b8fac7fecca9a1 /tools/configure
parent914b138f75542bd4beae57562e37f30cce990dc8 (diff)
downloadQt-a545e26e1183133f4a66cb9a3bcd9051e2d77894.zip
Qt-a545e26e1183133f4a66cb9a3bcd9051e2d77894.tar.gz
Qt-a545e26e1183133f4a66cb9a3bcd9051e2d77894.tar.bz2
Make configure.exe accept -no-gif again, fix comment
Reviewed-By: Jason McDonald
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 7f2d53b..c3498e3 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -581,6 +581,8 @@ void Configure::parseCmdLine()
// Image formats --------------------------------------------
else if (configCmdLine.at(i) == "-no-gif")
dictionary[ "GIF" ] = "no";
+ else if (configCmdLine.at(i) == "-qt-gif")
+ dictionary[ "GIF" ] = "yes";
else if (configCmdLine.at(i) == "-no-libtiff") {
dictionary[ "TIFF"] = "no";
@@ -1741,7 +1743,7 @@ bool Configure::displayHelp()
desc("ZLIB", "system", "-system-zlib", "Use zlib from the operating system.\nSee http://www.gzip.org/zlib\n");
desc("GIF", "no", "-no-gif", "Do not compile GIF reading support.");
- desc("GIF", "auto", "-qt-gif", "Compile GIF reading support.\nSee also src/gui/image/qgifhandler.h\n");
+ desc("GIF", "auto", "-qt-gif", "Compile GIF reading support.\nSee also src/gui/image/qgifhandler_p.h\n");
desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support.");
desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt.");