Merge branch '2.0'

2016-08-04 00:08:53 +02:00
parent a10a30f390 8d16522d39
commit c78822f6e6
12 changed files with 120 additions and 14 deletions
--- a/src/format/KeePass2Reader.cpp
+++ b/src/format/KeePass2Reader.cpp
@@ -192,7 +192,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
        QByteArray headerHash = CryptoHash::hash(headerStream.storedData(), CryptoHash::Sha256);
        if (headerHash != xmlReader.headerHash()) {
            raiseError("Header doesn't match hash");
-            return nullptr;
+            return Q_NULLPTR;
        }
    }