summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-10-20 00:33:06 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-10-20 00:33:06 (GMT)
commit074bcbc746ab3f8669634ff00af0250b592baa48 (patch)
tree431ec8b75bbf4dd81bbef940f8ba3f4d3a325c2d
parent6e3639cd4751b957f12bcc3224f1a8c4d15d036c (diff)
downloadQt-074bcbc746ab3f8669634ff00af0250b592baa48.zip
Qt-074bcbc746ab3f8669634ff00af0250b592baa48.tar.gz
Qt-074bcbc746ab3f8669634ff00af0250b592baa48.tar.bz2
doc
Record current DB type in INI for future extensibility.
-rw-r--r--src/declarative/extra/qmlfontloader.cpp4
-rw-r--r--src/declarative/qml/qmlsqldatabase.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/extra/qmlfontloader.cpp b/src/declarative/extra/qmlfontloader.cpp
index 4a447de..2193b68 100644
--- a/src/declarative/extra/qmlfontloader.cpp
+++ b/src/declarative/extra/qmlfontloader.cpp
@@ -75,13 +75,13 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FontLoader,QmlFontLoader)
\brief This item allows using fonts by name or url.
Example:
- \code
+ \qml
FontLoader { id: FixedFont; name: "Courier" }
FontLoader { id: WebFont; source: "http://www.mysite.com/myfont.ttf" }
Text { text: "Fixed-size font"; font.family: FixedFont.name }
Text { text: "Fancy font"; font.family: WebFont.name }
- \endcode
+ \endqml
*/
QmlFontLoader::QmlFontLoader(QObject *parent)
: QObject(*(new QmlFontLoaderPrivate), parent)
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index b132c55..4a5983d 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -312,6 +312,9 @@ static QScriptValue qmlsqldatabase_transaction(QScriptContext *context, QScriptE
}
+/*
+ Currently documented in doc/src/declarastive/globalobject.qdoc
+*/
static QScriptValue qmlsqldatabase_open(QScriptContext *context, QScriptEngine *engine)
{
QSqlDatabase database;
@@ -343,6 +346,7 @@ static QScriptValue qmlsqldatabase_open(QScriptContext *context, QScriptEngine *
ini.setValue(QLatin1String("Version"), dbversion);
ini.setValue(QLatin1String("Description"), dbdescription);
ini.setValue(QLatin1String("EstimatedSize"), dbestimatedsize);
+ ini.setValue(QLatin1String("DbType"), QLatin1String("QSQLITE"));
database.open();
}