Skip to content

Commit

Permalink
Fixed Qt 5 compilation issues again
Browse files Browse the repository at this point in the history
Qt 5 is being a bit more strict with the QT_NO_CAST_FROM_ASCII define
than Qt 4.
  • Loading branch information
bjorn committed Sep 1, 2012
1 parent 10c407a commit 1147e64
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libtiled/mapreader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -400,15 +400,15 @@ void MapReaderPrivate::readTilesetImage(Tileset *tileset)

QImage MapReaderPrivate::readImage()
{
Q_ASSERT(xml.isStartElement() && xml.name() == "image");
Q_ASSERT(xml.isStartElement() && xml.name() == QLatin1String("image"));

const QXmlStreamAttributes atts = xml.attributes();
QString source = atts.value(QLatin1String("source")).toString();
QString format = atts.value(QLatin1String("format")).toString();

if (source.isEmpty()) {
while (xml.readNextStartElement()) {
if (xml.name() == "data") {
if (xml.name() == QLatin1String("data")) {
const QXmlStreamAttributes atts = xml.attributes();
QString encoding = atts.value(QLatin1String("encoding"))
.toString();
Expand Down

0 comments on commit 1147e64

Please sign in to comment.