diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 17:33:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 17:33:27 (GMT) |
| commit | 295ee37222e978883509e18ae3ad275a49192a87 (patch) | |
| tree | 4878b08e67b2e386b66e7798c4110b2b56087fc1 /configure | |
| parent | b42d2831dff9bbb7254e0b4f014958dded2f7e59 (diff) | |
| parent | ebf650dd893a8f6ace2252cd2a18ee895520f29d (diff) | |
| download | Qt-295ee37222e978883509e18ae3ad275a49192a87.zip Qt-295ee37222e978883509e18ae3ad275a49192a87.tar.gz Qt-295ee37222e978883509e18ae3ad275a49192a87.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Check in the correct configure.exe
Examples: Fix compilation with namespace.
Rebuilt configure.exe
Make configure.exe accept -no-gif again, fix comment
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3636,7 +3636,7 @@ Third Party Libraries: -no-gif ............ Do not compile GIF reading support. * -qt-gif ............ Compile GIF reading support. - See also src/gui/image/qgifhandler.h + See also src/gui/image/qgifhandler_p.h -no-libtiff ........ Do not compile TIFF support. -qt-libtiff ........ Use the libtiff bundled with Qt. |