summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/doc/snippets/sqldatabase/sqldatabase.cpp5
-rw-r--r--src/sql/drivers/psql/qsql_psql.cpp2
2 files changed, 4 insertions, 3 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);
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index f4e40b6582..5dcabb0646 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -449,7 +449,7 @@ QVariant QPSQLResult::data(int i)
case QVariant::ByteArray: {
size_t len;
unsigned char *data = PQunescapeBytea((const unsigned char*)val, &len);
- QByteArray ba((const char*)data, len);
+ QByteArray ba(reinterpret_cast<const char *>(data), int(len));
qPQfreemem(data);
return QVariant(ba);
}