summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Sanders <don.sanders@nokia.com>2011-06-06 12:09:47 +0300
committerDon Sanders <don.sanders@nokia.com>2011-06-06 12:09:47 +0300
commit813bd1402bc1b882b6053d6b28f817ce00d693aa (patch)
tree36d57c69ada51f85068f623b64b26d3b0c4bed79
parentab4bafb9e2f09fa275211bad3188f69c390d7bba (diff)
Ensure QMF doesn't use default QSqlDatabase connection name.
Patch from Edit Siket-szasz. Fix for NB#252787
-rw-r--r--CHANGES1
-rw-r--r--src/libraries/qmfclient/support/qmailnamespace.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index d1af9a31..54a60c98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ Latest Changes
* Fixes: NB#207864 Protocol plugin services should only be restarted when necessary
* Fixes: NB#217492 "Unable to retrieve message list for unconfigured accounts" is displayed as title in Inbox
* Fixes: NB#261611 - Random messageserver crash observed when disabling IMAP accounts
+ * Fixes: NB#252787 - Unable to send an invitation if location is selected for the event
201121
* Fixes: NB#232541 Calendar icon not displayed
diff --git a/src/libraries/qmfclient/support/qmailnamespace.cpp b/src/libraries/qmfclient/support/qmailnamespace.cpp
index 368f9479..a5c991e1 100644
--- a/src/libraries/qmfclient/support/qmailnamespace.cpp
+++ b/src/libraries/qmfclient/support/qmailnamespace.cpp
@@ -372,9 +372,9 @@ QSqlDatabase QMail::createDatabase()
QSqlDatabase db;
if(init) {
#endif
- db = QSqlDatabase::database();
+ db = QSqlDatabase::database("qmailstore_sql_connection");
} else {
- db = QSqlDatabase::addDatabase("QSQLITE");
+ db = QSqlDatabase::addDatabase("QSQLITE", "qmailstore_sql_connection");
#if defined(Q_OS_SYMBIAN)
#ifdef SYMBIAN_USE_DATA_CAGED_DATABASE