diff options
author | Denis Mingulov <denis.mingulov@gmail.com> | 2010-09-13 12:01:12 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-09-13 12:13:00 +0200 |
commit | eed852d8be2a36e5a5d6bd1b30f72faed0c7a336 (patch) | |
tree | fe698f182be4c835f29783edf6169f4b617023ea /src/plugins/imageviewer/imageview.cpp | |
parent | efe3dc93d6bc3102d7a5d7599df32c1aabc095b0 (diff) |
Image Viewer: Fix for compiling without QtSvg
Merge-request: 177
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins/imageviewer/imageview.cpp')
-rw-r--r-- | src/plugins/imageviewer/imageview.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp index c4e570bacf3..aa277c626c0 100644 --- a/src/plugins/imageviewer/imageview.cpp +++ b/src/plugins/imageviewer/imageview.cpp @@ -46,7 +46,9 @@ #include <QtGui/QMouseEvent> #include <QtGui/QGraphicsRectItem> #include <QtGui/QPixmap> +#ifndef QT_NO_SVG #include <QtSvg/QGraphicsSvgItem> +#endif #include <QtGui/QImageReader> #include <qmath.h> @@ -104,15 +106,19 @@ void ImageView::drawBackground(QPainter *p, const QRectF &) bool ImageView::openFile(QString fileName) { +#ifndef QT_NO_SVG bool isSvg = false; +#endif QByteArray format = QImageReader::imageFormat(fileName); // if it is impossible to recognize a file format - file will not be open correctly if (format.isEmpty()) return false; +#ifndef QT_NO_SVG if (format.startsWith("svg")) isSvg = true; +#endif QGraphicsScene *s = scene(); @@ -123,9 +129,12 @@ bool ImageView::openFile(QString fileName) resetTransform(); // image +#ifndef QT_NO_SVG if (isSvg) { d_ptr->imageItem = new QGraphicsSvgItem(fileName); - } else { + } else +#endif + { QPixmap pixmap(fileName); QGraphicsPixmapItem *pixmapItem = new QGraphicsPixmapItem(pixmap); pixmapItem->setTransformationMode(Qt::SmoothTransformation); |