summaryrefslogtreecommitdiffstats
path: root/examples/animation/sub-attaq/pixmapitem.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-02-25 19:23:06 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-25 21:30:45 +0100
commitffa072655df50ba0f6d21d0696750f06abf20e4c (patch)
treee14a3f397102660ad9fc2df387b32bb50c3b8f8f /examples/animation/sub-attaq/pixmapitem.cpp
parentd91add71e79dcae45f9cac02f6d3d542afee899c (diff)
Fix compilation of examples with QStringBuilder
In sub-attack an interview, one can't make two implicit conversions at once, so explicitly convert to the right type. The change in the torrent example is required because of https://codereview.qt-project.org/16168 (commit 9491272) But in that case, using a QByteArray is better anyway. Change-Id: Ieed22ac7f0d700d5ba5d1e70af3db4dd6c139c8f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'examples/animation/sub-attaq/pixmapitem.cpp')
-rw-r--r--examples/animation/sub-attaq/pixmapitem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/animation/sub-attaq/pixmapitem.cpp b/examples/animation/sub-attaq/pixmapitem.cpp
index b2061dc06c..077151d708 100644
--- a/examples/animation/sub-attaq/pixmapitem.cpp
+++ b/examples/animation/sub-attaq/pixmapitem.cpp
@@ -48,9 +48,9 @@
PixmapItem::PixmapItem(const QString &fileName,GraphicsScene::Mode mode, QGraphicsItem * parent) : QGraphicsObject(parent)
{
if (mode == GraphicsScene::Big)
- pix = ":/big/" + fileName;
+ pix = QPixmap(QStringLiteral(":/big/") + fileName);
else
- pix = ":/small/" + fileName;
+ pix = QPixmap(QStringLiteral(":/small/") + fileName);
}
PixmapItem::PixmapItem(const QString &fileName, QGraphicsScene *scene) : QGraphicsObject(), pix(fileName)