diff options
Diffstat (limited to 'qmake/library/qmakevfs.cpp')
| -rw-r--r-- | qmake/library/qmakevfs.cpp | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp index 3ccfcc78ee..a8517de0ff 100644 --- a/qmake/library/qmakevfs.cpp +++ b/qmake/library/qmakevfs.cpp @@ -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 #include "qmakevfs.h" @@ -142,12 +117,12 @@ bool QMakeVfs::writeFile(int id, QIODevice::OpenMode mode, VfsFlags flags, QMutexLocker locker(&m_mutex); # endif QString *cont = &m_files[id]; - Q_UNUSED(flags) + Q_UNUSED(flags); if (mode & QIODevice::Append) *cont += contents; else *cont = contents; - Q_UNUSED(errStr) + Q_UNUSED(errStr); return true; #else QFileInfo qfi(fileNameForId(id)); @@ -243,7 +218,7 @@ bool QMakeVfs::exists(const QString &fn, VfsFlags flags) if (it != m_files.constEnd()) return it->constData() != m_magicMissing.constData(); #else - Q_UNUSED(flags) + Q_UNUSED(flags); #endif bool ex = IoUtils::fileType(fn) == IoUtils::FileIsRegular; #ifndef PROEVALUATOR_FULL |