diff options
Diffstat (limited to 'src/tools/moc/collectjson.cpp')
| -rw-r--r-- | src/tools/moc/collectjson.cpp | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/src/tools/moc/collectjson.cpp b/src/tools/moc/collectjson.cpp index fe499151cb..d542e2abc4 100644 --- a/src/tools/moc/collectjson.cpp +++ b/src/tools/moc/collectjson.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <qfile.h> #include <qjsonarray.h> @@ -51,9 +26,9 @@ static bool readFromDevice(QIODevice *device, QJsonArray *allMetaObjects) return true; } -int collectJson(const QStringList &jsonFiles, const QString &outputFile) +int collectJson(const QStringList &jsonFiles, const QString &outputFile, bool skipStdIn) { - qSetGlobalQHashSeed(0); + QHashSeed::setDeterministicGlobalSeed(); QFile output; if (outputFile.isEmpty()) { @@ -70,7 +45,7 @@ int collectJson(const QStringList &jsonFiles, const QString &outputFile) } QJsonArray allMetaObjects; - if (jsonFiles.isEmpty()) { + if (jsonFiles.isEmpty() && !skipStdIn) { QFile f; if (!f.open(stdin, QIODevice::ReadOnly)) { fprintf(stderr, "Error opening stdin for reading\n"); @@ -85,7 +60,7 @@ int collectJson(const QStringList &jsonFiles, const QString &outputFile) QStringList jsonFilesSorted = jsonFiles; jsonFilesSorted.sort(); - for (const QString &jsonFile : qAsConst(jsonFilesSorted)) { + for (const QString &jsonFile : std::as_const(jsonFilesSorted)) { QFile f(jsonFile); if (!f.open(QIODevice::ReadOnly)) { fprintf(stderr, "Error opening %s for reading\n", qPrintable(jsonFile)); |