diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/sql/doc | |
parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/sql/doc')
-rw-r--r-- | src/sql/doc/src/sql-programming.qdoc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/sql/doc/src/sql-programming.qdoc b/src/sql/doc/src/sql-programming.qdoc index ece89a30ab..f20b1292fc 100644 --- a/src/sql/doc/src/sql-programming.qdoc +++ b/src/sql/doc/src/sql-programming.qdoc @@ -105,7 +105,6 @@ \page sql-connecting.html \title Connecting to Databases - \contentspage SQL Programming \previouspage SQL Programming \nextpage Executing SQL Statements @@ -175,7 +174,6 @@ \title Executing SQL Statements \previouspage Connecting to Databases - \contentspage SQL Programming \nextpage Using the SQL Model Classes @@ -325,7 +323,6 @@ \title Using the SQL Model Classes \previouspage Executing SQL Statements - \contentspage SQL Programming \nextpage Presenting Data in a Table View In addition to QSqlQuery, Qt offers three higher-level classes @@ -471,7 +468,6 @@ \title Presenting Data in a Table View \previouspage Using the SQL Model Classes - \contentspage SQL Programming \nextpage Creating Data-Aware Forms The QSqlQueryModel, QSqlTableModel, and QSqlRelationalTableModel @@ -575,7 +571,6 @@ \title Creating Data-Aware Forms \previouspage Presenting Data in a Table View - \contentspage SQL Programming Using the SQL models described above, the contents of a database can be presented to other model/view components. For some applications, |