Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/gui/image/qpnghandler.cpp

Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301

1 files changed, 5 insertions, 5 deletions

diff --git a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
index bba0487452..a45b5f409a 100644
--- a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
+++ b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
@@ -249,16 +249,15 @@ void QSqlQueryModel_snippets()
     }
 
 //! [21]
-    QSqlTableModel model;
-    model.setTable("employee");
-    model.select();
+    QSqlQueryModel model;
+    model.setQuery("SELECT name, salary FROM employee");
     int salary = model.record(4).value("salary").toInt();
 //! [21]
     Q_UNUSED(salary);
 
     {
 //! [22]
-    int salary = model.data(model.index(4, 2)).toInt();
+    int salary = model.data(model.index(4, 1)).toInt();
 //! [22]
     Q_UNUSED(salary);
     }
@@ -308,7 +307,8 @@ void QSqlTableModel_snippets()
 //! [25]
     QSqlTableModel model;
     model.setTable("employee");
-    QString name = model.record(4).value("name").toString();
+    model.select();
+    int salary = model.record(4).value("salary").toInt();
 //! [25]
     }
 }