summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-10-10 13:29:23 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-10-10 13:30:37 (GMT)
commit2299f684f0ca6bdf49128b17c49488ae27b49479 (patch)
tree0db938ff15409c35c4250245a699423eb0af1dff
parentae620eb773a5fd217de4766fc829e51417cb9e70 (diff)
downloadQt-2299f684f0ca6bdf49128b17c49488ae27b49479.zip
Qt-2299f684f0ca6bdf49128b17c49488ae27b49479.tar.gz
Qt-2299f684f0ca6bdf49128b17c49488ae27b49479.tar.bz2
Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
In Symbian, the sqlite database doesn't like mixing native and Qt separators in the database name, so ensure only native separators are used when declarative sets the database name. Task-number: QTBUG-20836 Reviewed-by: Sami Merila
-rw-r--r--src/declarative/qml/qdeclarativesqldatabase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
index 588b6bf..513cae2 100644
--- a/src/declarative/qml/qdeclarativesqldatabase.cpp
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -175,7 +175,7 @@ static const char* sqlerror[] = {
static QString qmlsqldatabase_databasesPath(QScriptEngine *engine)
{
QDeclarativeScriptEngine *qmlengine = static_cast<QDeclarativeScriptEngine*>(engine);
- return qmlengine->offlineStoragePath
+ return QDir::toNativeSeparators(qmlengine->offlineStoragePath)
+ QDir::separator() + QLatin1String("Databases");
}