uonedb-qt team mailing list archive
-
uonedb-qt team
-
Mailing list archive
-
Message #00339
[Merge] lp:~aacid/u1db-qt/qt54 into lp:u1db-qt
Albert Astals Cid has proposed merging lp:~aacid/u1db-qt/qt54 into lp:u1db-qt.
Commit message:
Make tests pass with Qt 5.4
Requested reviews:
U1DB Qt developers (uonedb-qt)
For more details, see:
https://code.launchpad.net/~aacid/u1db-qt/qt54/+merge/250282
--
Your team U1DB Qt developers is requested to review the proposed merge of lp:~aacid/u1db-qt/qt54 into lp:u1db-qt.
=== 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;