diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
| commit | f6dbdd9c16166f345fd5743886229192c97c2c4f (patch) | |
| tree | 05e5e7b806dd627be4e3ba6fc9a32f115847acb0 /src/sql/doc/src | |
| parent | b8084618545570a8832d344a2e9586e1226cc697 (diff) | |
| parent | 47efa9213d92a4366e03bd6d056837cd5bbadb1e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/sql/drivers/sqlite/qsql_sqlite.cpp
Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
Diffstat (limited to 'src/sql/doc/src')
| -rw-r--r-- | src/sql/doc/src/sql-driver.qdoc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index 82dfa27e46..92727b2d1c 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -151,9 +151,8 @@ \snippet code/doc_src_sql-driver.qdoc 3 - After installing Qt, as described in the \l{Installing Qt for X11 - Platforms} document, you also need to install the plugin in the - standard location: + After installing Qt, you also need to install the plugin in the standard + location: \snippet code/doc_src_sql-driver.qdoc 4 @@ -478,8 +477,8 @@ \snippet code/doc_src_sql-driver.qdoc 13 - After installing Qt, as described in the \l{Installing Qt for X11 Platforms} document, - you also need to install the plugin in the standard location: + After installing Qt, you also need to install the plugin in the standard + location: \snippet code/doc_src_sql-driver.qdoc 14 @@ -565,8 +564,8 @@ \snippet code/doc_src_sql-driver.qdoc 18 - After installing Qt, as described in the \l{Installing Qt for X11 Platforms} document, - you also need to install the plugin in the standard location: + After installing Qt, you also need to install the plugin in the standard + location: \snippet code/doc_src_sql-driver.qdoc 19 @@ -640,8 +639,7 @@ \snippet code/doc_src_sql-driver.qdoc 21 - After installing Qt, as described in the \l{Installing Qt for X11 Platforms} document, - you also need to install the plugin in the standard location: + After installing Qt, you also need to install the plugin in the standard location: \snippet code/doc_src_sql-driver.qdoc 22 |