diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 19:38:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-26 19:38:46 (GMT) |
| commit | 1a1eeba0086d764474546da7fe443bf210d4d974 (patch) | |
| tree | 8d42fbce05e87c2908fcec8572a61c6501be5f15 /src/gui | |
| parent | 63bd10ae61ed0b877344b217e57eb87f77256e98 (diff) | |
| parent | 53abbf0cedbf2e3478e63c1b007d27a943df630d (diff) | |
| download | Qt-1a1eeba0086d764474546da7fe443bf210d4d974.zip Qt-1a1eeba0086d764474546da7fe443bf210d4d974.tar.gz Qt-1a1eeba0086d764474546da7fe443bf210d4d974.tar.bz2 | |
Merge branch '4.5' into 4.6-staging
Conflicts:
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qppmhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp index 8ec9efb..f2d51f7 100644 --- a/src/gui/image/qppmhandler.cpp +++ b/src/gui/image/qppmhandler.cpp @@ -264,7 +264,7 @@ static bool write_pbm_image(QIODevice *out, const QImage &sourceImage, const QBy bool gray = format == "pgm"; if (format == "pbm") { - image = image.convertToFormat(QImage::Format_MonoLSB); + image = image.convertToFormat(QImage::Format_Mono); } else if (image.depth() == 1) { image = image.convertToFormat(QImage::Format_Indexed8); } else { |