diff options
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r-- | qmake/project.cpp | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 15870395ae..462c8d709a 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1,33 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the qmake application 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "project.h" +#include "cachekeys.h" #include "option.h" #include <qmakeevaluator_p.h> @@ -52,8 +28,10 @@ QMakeProject::QMakeProject(QMakeProject *p) bool QMakeProject::boolRet(VisitReturn vr) { - if (vr == ReturnError) + if (vr == ReturnError) { + qmakeClearCaches(); exit(3); + } Q_ASSERT(vr == ReturnTrue || vr == ReturnFalse); return vr != ReturnFalse; } @@ -160,7 +138,7 @@ void QMakeProject::dump() const } } out.sort(); - for (const QString &v : qAsConst(out)) + for (const QString &v : std::as_const(out)) puts(qPrintable(v)); } |