1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moc: error out when the Q_PLUGIN_METADATA file can't be opened

Browse Source 
Task-number: QTBUG-56045
Change-Id: Ib058791036a2728dcd6215009a4ff206278bed14
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Olivier Goffart 2016-09-17 12:10:36 +02:00 committed by Olivier Goffart (Woboq GmbH)
parent 8a410f60ae
commit 0e20635c39
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/moc/moc.cpp
View File

@ -1294,7 +1294,12 @@ void Moc::parsePluginData(ClassDef *def)
return;
}
QFile file(fi.canonicalFilePath());
file.open(QFile::ReadOnly);
if (!file.open(QFile::ReadOnly)) {
QByteArray msg = "Plugin Metadata file " + lexem() + " could not be opened: "
+ file.errorString().toUtf8();
error(msg.constData());
return;
}
metaData = file.readAll();
}
}

16
tests/auto/tools/moc/tst_moc.cpp
View File

@ -2145,6 +2145,22 @@ void tst_Moc::warnings_data()
<< 0
<< QString()
<< QString("standard input:1: Note: No relevant classes found. No output generated.");
QTest::newRow("Q_PLUGIN_METADATA: invalid file")
<< QByteArray("class X { \n Q_PLUGIN_METADATA(FILE \"does.not.exists\") \n };")
<< QStringList()
<< 1
<< QString()
<< QString("standard input:2: Error: Plugin Metadata file \"does.not.exists\" does not exist. Declaration will be ignored");
#ifdef Q_OS_LINUX // Limit to Linux because the error message is platform-dependent
QTest::newRow("Q_PLUGIN_METADATA: unreadable file")
<< QByteArray("class X { \n Q_PLUGIN_METADATA(FILE \".\") \n };")
<< QStringList()
<< 1
<< QString()
<< QString("standard input:2: Error: Plugin Metadata file \".\" could not be opened: file to open is a directory");
#endif
}
void tst_Moc::warnings()