Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
authorMark Brand <mabrand@mabrand.nl>
Fri, 2 Jul 2010 16:30:33 +0000 (18:30 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 2 Jul 2010 16:37:01 +0000 (18:37 +0200)
commit802dc404d1af9a08fdc23ef32e2fbc77f138f70a
treef980aa8560c2c64b89cfbed0e80db7d314c00866
parent51ba8332385f3abceae88ec0a7ae29ac1e875a5c
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers

Previously, although the configure shell script could configure
built-in support for these image formats, the .pr[io] files
would nevertheless build them as plugins. Support was also
missing from qimagereader and qimagewriter. This has now been
added.

Configure.exe, while clearly intended to support this too,
needed a few minor fixes. For example, the usage of values
"qt" and "yes" was inconsistent.

For both configure tools, the explanation of the *non*-related
options has been clarified, i.e:
    -no-libjpeg
    -qt-libjpeg
    -system-libjpeg
These options have nothing to do with the plugin/built-in
distinction.

There are (still) no configure options for specifying "plugin" or
"built-in" for these image formats. Quite reasonably, "plugin"
is selected for shared Qt and "built-in" is selected for static Qt.

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
configure
src/gui/image/qimagereader.cpp
src/gui/image/qimagewriter.cpp
src/plugins/imageformats/imageformats.pro
src/winmain/winmain.pro
tools/configure/configureapp.cpp