diff options
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 60431d622a..6ab4ad505d 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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 #ifndef MAKEFILE_H #define MAKEFILE_H @@ -121,6 +96,7 @@ protected: void writeSubTargetCall(QTextStream &t, const QString &in_directory, const QString &in, const QString &out_directory, const QString &out, const QString &out_directory_cdin, const QString &makefilein); + virtual void suppressBuiltinRules(QTextStream &t) const; virtual void writeSubMakeCall(QTextStream &t, const QString &outDirectory_cdin, const QString &makeFileIn); virtual void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags); @@ -169,7 +145,8 @@ protected: CompilerBuiltin = 0x01, CompilerNoCheckDeps = 0x02, CompilerRemoveNoExist = 0x04, - CompilerAddInputsAsMakefileDeps = 0x08 + CompilerWarnNoExist = 0x08, + CompilerAddInputsAsMakefileDeps = 0x10 }; uint flags, type; }; @@ -266,7 +243,17 @@ protected: const QString &fixedFile); QString createResponseFile(const QString &baseName, const ProStringList &objList, - const QString &prefix = QString()); + const QString &prefix = QString()) const; + + struct LinkerResponseFileInfo + { + QString filePath; + bool onlyObjects; + + bool isValid() const { return !filePath.isEmpty(); } + }; + + LinkerResponseFileInfo maybeCreateLinkerResponseFile() const; public: QMakeProject *projectFile() const; |