diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-01-05 00:40:47 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-01-05 00:40:47 (GMT) |
| commit | 7a979f8dab64c33a7088b70ca5bff69b881ee55d (patch) | |
| tree | f6d5d0cd9cd59bfdde3798ed4b94a744a01ad20d | |
| parent | 31460847fed4bc0867c3fd78466fed32e407fafb (diff) | |
| download | Qt-7a979f8dab64c33a7088b70ca5bff69b881ee55d.zip Qt-7a979f8dab64c33a7088b70ca5bff69b881ee55d.tar.gz Qt-7a979f8dab64c33a7088b70ca5bff69b881ee55d.tar.bz2 | |
Add clarifications to QML SQL docs.
Reviewed-by: Bea Lam
| -rw-r--r-- | doc/src/declarative/globalobject.qdoc | 7 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativesqldatabase.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc index ffc84f9..ef8de5e 100644 --- a/doc/src/declarative/globalobject.qdoc +++ b/doc/src/declarative/globalobject.qdoc @@ -141,8 +141,9 @@ using the Offline Storage API. \section3 db = openDatabaseSync(identifier, version, description, estimated_size, callback(db)) Returns the database identified by \e identifier. If the database does not already exist, it -is created with the properties \e description and \e estimated_size and the function \e callback -is called with the database as a parameter. +is created, and the function \e callback is called with the database as a parameter. \e description +and \e estimated_size are written to the INI file (described below), but are otherwise currently +unused. May throw exception with code property SQLException.DATABASE_ERR, or SQLException.VERSION_ERR. @@ -153,7 +154,7 @@ When a database is first created, an INI file is also created specifying its cha \row \o Name \o The name of the database passed to \c openDatabase() \row \o Version \o The version of the database passed to \c openDatabase() \row \o Description \o The description of the database passed to \c openDatabase() -\row \o EstimatedSize \o The estimated size of the database passed to \c openDatabase() +\row \o EstimatedSize \o The estimated size (in bytes) of the database passed to \c openDatabase() \row \o Driver \o Currently "QSQLITE" \endtable diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp index bda02a5..a774c02 100644 --- a/src/declarative/qml/qdeclarativesqldatabase.cpp +++ b/src/declarative/qml/qdeclarativesqldatabase.cpp @@ -351,7 +351,7 @@ static QScriptValue qmlsqldatabase_read_transaction(QScriptContext *context, QSc } /* - Currently documented in doc/src/declarastive/globalobject.qdoc + Currently documented in doc/src/declarative/globalobject.qdoc */ static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEngine *engine) { |