feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Unit tests: Fix ProjectInfoGenerator.* tests

Browse Source 
...by adapting to recent mime type changes:

    commit e8e46ab553
    Plugins: Fix that mimetype definition was not valid JSON

Change-Id: Iac416ab481814e4488fac4d818c51c647c1ec349
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-07-27 10:27:20 +02:00
parent c78ea5a7ea
commit ba6939fa90
6 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/unittest/mimedatabase-utilities.cpp
View File

@@ -32,6 +32,7 @@
#include <QString>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/stringutils.h>
namespace MimeDataBaseUtilities
{
@@ -47,9 +48,11 @@ bool addCppToolsMimeTypes()
if (file.open(QIODevice::ReadOnly)) {
auto doc = QJsonDocument::fromJson(file.readAll());
QJsonValue mimetypes = doc.object().value("Mimetypes");
if (!mimetypes.isString())
QString mimetypeString;
if (!Utils::readMultiLineString(mimetypes, &mimetypeString))
return false;
Utils::addMimeTypes(filePath, mimetypes.toString().trimmed().toUtf8());
Utils::addMimeTypes(filePath, mimetypeString.trimmed().toUtf8());
alreadyAdded = true;
return true;
}