diff -r 5dc02b23752f -r 3e2da88830cd src/declarative/graphicsitems/qdeclarativescalegrid.cpp --- a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -130,8 +130,9 @@ int b = -1; QString imgFile; - while(!data->atEnd()) { - QString line = QString::fromUtf8(data->readLine().trimmed()); + QByteArray raw; + while(raw = data->readLine(), !raw.isEmpty()) { + QString line = QString::fromUtf8(raw.trimmed()); if (line.isEmpty() || line.startsWith(QLatin1Char('#'))) continue;