diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /Plugins/DbSqlite2 | |
| parent | 1fc9d1a4a1af320e39810cee21bed1201e2bddfd (diff) | |
| parent | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (diff) | |
Merge tag 'upstream/3.0.6'
Upstream version 3.0.6
# gpg: Signature made Tue 12 May 2015 04:19:45 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'Plugins/DbSqlite2')
| -rw-r--r-- | Plugins/DbSqlite2/dbsqlite2.json | 2 | ||||
| -rw-r--r-- | Plugins/DbSqlite2/dbsqlite2instance.cpp | 5 | ||||
| -rw-r--r-- | Plugins/DbSqlite2/dbsqlite2instance.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Plugins/DbSqlite2/dbsqlite2.json b/Plugins/DbSqlite2/dbsqlite2.json index c1e1817..59a17e1 100644 --- a/Plugins/DbSqlite2/dbsqlite2.json +++ b/Plugins/DbSqlite2/dbsqlite2.json @@ -2,6 +2,6 @@ "type": "DbPlugin", "title": "SQLite 2", "description": "Provides support for SQLite 2.* databases", - "version": 10003, + "version": 10005, "author": "SalSoft" } diff --git a/Plugins/DbSqlite2/dbsqlite2instance.cpp b/Plugins/DbSqlite2/dbsqlite2instance.cpp index 905f6fe..35f1f9f 100644 --- a/Plugins/DbSqlite2/dbsqlite2instance.cpp +++ b/Plugins/DbSqlite2/dbsqlite2instance.cpp @@ -5,3 +5,8 @@ DbSqlite2Instance::DbSqlite2Instance(const QString& name, const QString& path, c { } + +QString DbSqlite2Instance::getEncoding() +{ + return "UTF-8"; +} diff --git a/Plugins/DbSqlite2/dbsqlite2instance.h b/Plugins/DbSqlite2/dbsqlite2instance.h index 83c54d3..08ea368 100644 --- a/Plugins/DbSqlite2/dbsqlite2instance.h +++ b/Plugins/DbSqlite2/dbsqlite2instance.h @@ -22,6 +22,8 @@ class DbSqlite2Instance : public AbstractDb2<Sqlite2> * All values from this constructor are just passed to AbstractDb2 constructor. */ DbSqlite2Instance(const QString& name, const QString& path, const QHash<QString, QVariant>& connOptions); + + QString getEncoding(); }; #endif // DBSQLITE2INSTANCE_H |