summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@digia.com>2012-12-06 15:36:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-06 16:45:52 +0100
commitae6389a08662d7ef4296a680c52490e24ae20e26 (patch)
tree2f327ea1cf671d7c689f0b8c8d1f310f9c401f8a /src/sql
parent5b57d93dcdeabbd704205b7bdef20c82f1e22a09 (diff)
Docs: Fix some warnings
Change-Id: I3898c89e54aa671ff8cb1b25c49cfe3835ab9384 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/kernel/qsqldriver.cpp1
-rw-r--r--src/sql/models/qsqlrelationaldelegate.cpp6
-rw-r--r--src/sql/models/qsqlrelationaltablemodel.cpp1
3 files changed, 3 insertions, 5 deletions
diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp
index 62ec4e7e1f..841c563973 100644
--- a/src/sql/kernel/qsqldriver.cpp
+++ b/src/sql/kernel/qsqldriver.cpp
@@ -218,6 +218,7 @@ bool QSqlDriver::isOpenError() const
\value EventNotifications Whether the driver supports database event notifications.
\value FinishQuery Whether the driver can do any low-level resource cleanup when QSqlQuery::finish() is called.
\value MultipleResultSets Whether the driver can access multiple result sets returned from batched statements or stored procedures.
+ \value CancelQuery Whether the driver allows cancelling a running query.
More information about supported features can be found in the
\l{sql-driver.html}{Qt SQL driver} documentation.
diff --git a/src/sql/models/qsqlrelationaldelegate.cpp b/src/sql/models/qsqlrelationaldelegate.cpp
index af50c03b2d..e040789fa6 100644
--- a/src/sql/models/qsqlrelationaldelegate.cpp
+++ b/src/sql/models/qsqlrelationaldelegate.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QSqlRelationalDelegate
+ \inmodule QtSql
\brief The QSqlRelationalDelegate class provides a delegate that is used to
display and edit data from a QSqlRelationalTableModel.
@@ -88,11 +89,6 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn void QSqlRelationalDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
- \reimp
-*/
-
-/*!
\fn void QSqlRelationalDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const
\reimp
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index c3637f0db7..29a70391b1 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -67,6 +67,7 @@ typedef QSqlRelationalTableModelSql Sql;
/*!
\class QSqlRelation
+ \inmodule QtSql
\brief The QSqlRelation class stores information about an SQL foreign key.
QSqlRelation is a helper class for QSqlRelationalTableModel. See