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

Conflicts:
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/network/kernel/qnetworkinterface_winrt.cpp
	tools/configure/configureapp.cpp

Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea

1 files changed, 3 insertions, 2 deletions

diff --git a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
index 0938fa775d..068a2c04f1 100644
--- a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
+++ b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
@@ -239,8 +239,9 @@ void QSqlQueryModel_snippets()
     }
 
 //! [21]
-    QSqlQueryModel model;
-    model.setQuery("SELECT * FROM employee");
+    QSqlTableModel model;
+    model.setTable("employee");
+    model.select();
     int salary = model.record(4).value("salary").toInt();
 //! [21]
     Q_UNUSED(salary);