Merge lp:~aacid/u1db-qt/qt54 into lp:u1db-qt

[Albert Astals Cid]

Make tests pass with Qt 5.4

[Cris Dywan (kalikiana)]

For the record, the lack of an "else" slightly bugged me, but the fact is that an empty string can be passed to putDoc and thereby contents to delete an existing document, thus I feel it's not something to tackle here as part of the fix.

Thanks a lot!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-vivid-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/60/rebuild

review: Approve (continuous-integration)

=== modified file 'src/database.cpp'
--- src/database.cpp	2014-11-07 14:30:31 +0000
+++ src/database.cpp	2015-02-19 10:38:43 +0000
@@ -626,6 +626,9 @@
     if (!initializeIfNeeded())
         return "";
 
+    if (contents.canConvert<QVariantMap>())
+        contents = contents.value<QVariantMap>();
+
     ScopedTransaction t(m_db);
 
     QString newOrEmptyDocId(docId);
 
=== modified file 'src/document.cpp'
--- src/document.cpp	2013-04-23 15:17:24 +0000
+++ src/document.cpp	2015-02-19 10:38:43 +0000
@@ -172,6 +172,9 @@
 void
 Document::setDefaults(QVariant defaults)
 {
+    if (defaults.canConvert<QVariantMap>())
+        defaults = defaults.value<QVariantMap>();
+
     if (m_defaults == defaults)
         return;
 
@@ -195,6 +198,9 @@
 void
 Document::setContents(QVariant contents)
 {
+    if (contents.canConvert<QVariantMap>())
+        contents = contents.value<QVariantMap>();
+
     if (m_contents == contents)
         return;