From: Marcus Eggenberger Date: Thu, 15 Apr 2010 12:31:51 +0000 (+0200) Subject: enforce usage of SQLite in Monolithic mode X-Git-Tag: 0.6.1~5 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ea54ad388ad71169d16ef0a08488fa4972b526f1;hp=4809696f73b9e8eb3be7ed680fe97dbc074c71d3 enforce usage of SQLite in Monolithic mode --- diff --git a/src/core/core.cpp b/src/core/core.cpp index 29174b62..378e3a46 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -262,7 +262,7 @@ QString Core::setupCoreForInternalUsage() { } setupData["AdminUser"] = "AdminUser"; setupData["AdminPasswd"] = QString::number(pass); - setupData["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName(); + setupData["Backend"] = QString("SQLite"); // mono client currently needs sqlite return setupCore(setupData); } diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 5f36e83e..aa252e77 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -42,6 +42,9 @@ bool SqliteStorage::isAvailable() const { } QString SqliteStorage::displayName() const { + // We identify the backend to use for the monolithic core by its displayname. + // so only change this string if you _really_ have to and make sure the core + // setup for the mono client still works ;) return QString("SQLite"); }