Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I33b47095efdfe0ba698c6a88ca41ec911f432208

1 files changed, 6 insertions, 3 deletions

diff --git a/examples/widgets/itemviews/frozencolumn/main.cpp b/examples/widgets/itemviews/frozencolumn/main.cpp
index 5a4d3e0f42..6f2b4a8d71 100644
--- a/examples/widgets/itemviews/frozencolumn/main.cpp
+++ b/examples/widgets/itemviews/frozencolumn/main.cpp
@@ -51,6 +51,7 @@
 #include <QApplication>
 #include <QStandardItemModel>
 #include <QFile>
+#include <QTextStream>
 
 #include "freezetablewidget.h"
 
@@ -63,14 +64,16 @@ int main(int argc, char* argv[])
 
     QFile file(":/grades.txt");
     if (file.open(QFile::ReadOnly)) {
-        QString line = file.readLine(200);
+        QTextStream stream(&file);
+
+        QString line = stream.readLine();
         QStringList list = line.simplified().split(',');
         model->setHorizontalHeaderLabels(list);
 
         int row = 0;
         QStandardItem *newItem = 0;
-        while (file.canReadLine()) {
-            line = file.readLine(200);
+        while (!stream.atEnd()) {
+            line = stream.readLine();
             if (!line.startsWith('#') && line.contains(',')) {
                 list = line.simplified().split(',');
                 for (int col = 0; col < list.length(); ++col){