Merge branch '2.0'

This commit is contained in:
Felix Geyer 2015-12-15 21:05:00 +01:00
commit ecfbf72a57
33 changed files with 9516 additions and 347 deletions

View file

@ -112,6 +112,7 @@ void TestKeys::testFileKey_data()
{
QTest::addColumn<QString>("type");
QTest::newRow("Xml") << QString("Xml");
QTest::newRow("XmlBrokenBase64") << QString("XmlBrokenBase64");
QTest::newRow("Binary") << QString("Binary");
QTest::newRow("Hex") << QString("Hex");
QTest::newRow("Hashed") << QString("Hashed");