one more iteration to try to fix tests on travis

This commit is contained in:
2017-02-14 03:48:11 +03:00
parent ce09ab753b
commit 38c5589c10
11 changed files with 66 additions and 15 deletions

View File

@ -83,6 +83,18 @@ ExtScript *ExtScript::copy(const QString _fileName, const int _number)
}
QString ExtScript::jsonFiltersFile() const
{
QString fileName = QStandardPaths::locate(
QStandardPaths::GenericDataLocation,
QString(
"awesomewidgets/scripts/awesomewidgets-extscripts-filters.json"));
qCInfo(LOG_LIB) << "Filters file" << fileName;
return filename;
}
QString ExtScript::executable() const
{
return m_executable;
@ -240,11 +252,7 @@ void ExtScript::readConfiguration()
void ExtScript::readJsonFilters()
{
QString fileName = QStandardPaths::locate(
QStandardPaths::GenericDataLocation,
QString(
"awesomewidgets/scripts/awesomewidgets-extscripts-filters.json"));
qCInfo(LOG_LIB) << "Filters file" << fileName;
QString fileName = jsonFiltersFile();
QFile jsonFile(fileName);
if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
qCWarning(LOG_LIB) << "Could not open" << fileName;