Merge remote-tracking branch 'mainline/4.8'

1 files changed, 18 insertions, 10 deletions

diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 5b0406f..0edfaf4 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -710,24 +710,32 @@ void QSqlRelationalTableModel::clear()
 }
 
 
-/*! \enum QSqlRelationalTableModel::JoinMode
+/*!
+    \enum QSqlRelationalTableModel::JoinMode
+    \since 4.8
 
-    \value InnerJoin - Inner join mode, return rows when there is at least one match in both tables.
-    \value LeftJoin - Left join mode, returns all rows from the left table (table_name1), even if there are no matches in the right table (table_name2).
+    This enum specifies the type of mode to use when joining two tables.
 
-    \see QSqlRelationalTableModel::setJoinMode
-    \since 4.8
+    \value InnerJoin Inner join mode, return rows when there is at least one
+                     match in both tables.
+    \value LeftJoin  Left join mode, returns all rows from the left table
+                     (table_name1), even if there are no matches in the right
+                     table (table_name2).
+
+    \sa QSqlRelationalTableModel::setJoinMode()
 */
 
 /*!
-    Sets the SQL join mode to show or hide rows with NULL foreign keys.
-    In InnerJoin mode (the default) these rows will not be showed: use the
+    \since 4.8
+    Sets the SQL join mode to the value given by \a joinMode to show or hide
+    rows with NULL foreign keys.
+
+    In InnerJoin mode (the default) these rows will not be shown; use the
     LeftJoin mode if you want to show them.
 
-    \see QSqlRelationalTableModel::JoinMode
-    \since 4.8
+    \sa QSqlRelationalTableModel::JoinMode
 */
-void QSqlRelationalTableModel::setJoinMode( QSqlRelationalTableModel::JoinMode joinMode )
+void QSqlRelationalTableModel::setJoinMode(QSqlRelationalTableModel::JoinMode joinMode)
 {
     Q_D(QSqlRelationalTableModel);
     d->joinMode = joinMode;