AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid blocking read from stdin when collecting json files

Browse Source 
Change the behavior of moc when collecting json files. If argument files
are specified, suppose moc received empty input and skip input from
standard input.

Pick-to: 6.1
Fixes: QTBUG-93504
Change-Id: I45ec790ed458f1fae543d069555bc8abc6560816
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-05-28 11:14:39 +02:00
parent 97abef2140
commit c4b5e84e9e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/moc/collectjson.cpp
View File

@ -51,7 +51,7 @@ static bool readFromDevice(QIODevice *device, QJsonArray *allMetaObjects)
return true; return true;
} }
int collectJson(const QStringList &jsonFiles, const QString &outputFile) int collectJson(const QStringList &jsonFiles, const QString &outputFile, bool skipStdIn)
{ {
QHashSeed::setDeterministicGlobalSeed(); QHashSeed::setDeterministicGlobalSeed();
@ -70,7 +70,7 @@ int collectJson(const QStringList &jsonFiles, const QString &outputFile)
} }
QJsonArray allMetaObjects; QJsonArray allMetaObjects;
if (jsonFiles.isEmpty()) { if (jsonFiles.isEmpty() && !skipStdIn) {
QFile f; QFile f;
if (!f.open(stdin, QIODevice::ReadOnly)) { if (!f.open(stdin, QIODevice::ReadOnly)) {
fprintf(stderr, "Error opening stdin for reading\n"); fprintf(stderr, "Error opening stdin for reading\n");

2
src/tools/moc/collectjson.h
View File

@ -35,7 +35,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
int collectJson(const QStringList &jsonFiles, const QString &outputFile); int collectJson(const QStringList &jsonFiles, const QString &outputFile, bool skipStdIn);
QT_END_NAMESPACE QT_END_NAMESPACE

9
src/tools/moc/main.cpp
View File

@ -145,9 +145,10 @@ QByteArray composePreprocessorOutput(const Symbols &symbols) {
return output; return output;
} }
static QStringList argumentsFromCommandLineAndFile(const QStringList &arguments) static QStringList argumentsFromCommandLineAndFile(const QStringList &arguments, bool &hasOptionFiles)
{ {
QStringList allArguments; QStringList allArguments;
hasOptionFiles = false;
allArguments.reserve(arguments.size()); allArguments.reserve(arguments.size());
for (const QString &argument : arguments) { for (const QString &argument : arguments) {
// "@file" doesn't start with a '-' so we can't use QCommandLineParser for it // "@file" doesn't start with a '-' so we can't use QCommandLineParser for it
@ -163,6 +164,7 @@ static QStringList argumentsFromCommandLineAndFile(const QStringList &arguments)
error("Cannot open options file specified with @"); error("Cannot open options file specified with @");
return QStringList(); return QStringList();
} }
hasOptionFiles = true;
while (!f.atEnd()) { while (!f.atEnd()) {
QString line = QString::fromLocal8Bit(f.readLine().trimmed()); QString line = QString::fromLocal8Bit(f.readLine().trimmed());
if (!line.isEmpty()) if (!line.isEmpty())
@ -378,7 +380,8 @@ int runMoc(int argc, char **argv)
parser.addPositionalArgument(QStringLiteral("[MOC generated json file]"), parser.addPositionalArgument(QStringLiteral("[MOC generated json file]"),
QStringLiteral("MOC generated json output")); QStringLiteral("MOC generated json output"));
const QStringList arguments = argumentsFromCommandLineAndFile(app.arguments()); bool hasOptionFiles = false;
const QStringList arguments = argumentsFromCommandLineAndFile(app.arguments(), hasOptionFiles);
if (arguments.isEmpty()) if (arguments.isEmpty())
return 1; return 1;
@ -387,7 +390,7 @@ int runMoc(int argc, char **argv)
const QStringList files = parser.positionalArguments(); const QStringList files = parser.positionalArguments();
output = parser.value(outputOption); output = parser.value(outputOption);
if (parser.isSet(collectOption)) if (parser.isSet(collectOption))
return collectJson(files, output); return collectJson(files, output, hasOptionFiles);
if (files.count() > 1) { if (files.count() > 1) {
error(qPrintable(QLatin1String("Too many input files specified: '") + files.join(QLatin1String("' '")) + QLatin1Char('\''))); error(qPrintable(QLatin1String("Too many input files specified: '") + files.join(QLatin1String("' '")) + QLatin1Char('\'')));