diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-24 18:38:57 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-25 10:29:56 +0200 |
commit | 17ebedf5fc640abbe7af9ffc97bb62404a7eefdd (patch) | |
tree | e6de4c735058d3774ae7378cab8fe02c31abad4c /src/gui/image/qimage_p.h | |
parent | 82fcbe9d7d7505bb2e3fc53789e14405e73d5302 (diff) |
get rid of QT_NO_IMAGE_TEXT switcher
Change-Id: Ie72f907ffb959f629af6a414959348a992c4c941
Reviewed-by: aavit <qt_aavit@ovi.com>
Diffstat (limited to 'src/gui/image/qimage_p.h')
-rw-r--r-- | src/gui/image/qimage_p.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index fd1370d1d3..95108e9bf1 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -55,11 +55,8 @@ #include <QtCore/qglobal.h> -#include <QVector> - -#ifndef QT_NO_IMAGE_TEXT #include <QMap> -#endif +#include <QVector> QT_BEGIN_NAMESPACE @@ -103,9 +100,8 @@ struct Q_GUI_EXPORT QImageData { // internal image data // Return false if the conversion cannot be done in-place. bool convertInPlace(QImage::Format newFormat, Qt::ImageConversionFlags); -#ifndef QT_NO_IMAGE_TEXT QMap<QString, QString> text; -#endif + bool doImageIO(const QImage *image, QImageWriter* io, int quality) const; QPaintEngine *paintEngine; @@ -152,4 +148,4 @@ inline int qt_depthForFormat(QImage::Format format) QT_END_NAMESPACE -#endif +#endif // QIMAGE_P_H |