diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-23 08:35:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-23 08:35:49 +0200 |
| commit | 6572650641a2f64f0dd4f41b0426bbd3698f6530 (patch) | |
| tree | b28400a2983e044dc7911607ff57b27a9c8cd1bc /src/sql/kernel | |
| parent | 60e20abf19f58c34cb3a878636d955993b81cf2e (diff) | |
| parent | ac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: If11da7799075cc2d5768da5603c5fc46773c4eae
Diffstat (limited to 'src/sql/kernel')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 99aa3e96c4..01726d79ef 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -881,6 +881,14 @@ bool QSqlDatabase::rollback() connection name must be passed to addDatabase() at connection object create time. + For the QSQLITE driver, if the database name specified does not + exist, then it will create the file for you unless the + QSQLITE_OPEN_READONLY option is set. + + Additionally, \a name can be set to \c ":memory:" which will + create a temporary database which is only available for the + lifetime of the application. + For the QOCI (Oracle) driver, the database name is the TNS Service Name. |