diff options
Diffstat (limited to 'util/cmake/configurejson2cmake.py')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 3be7118080..50a40f6112 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -1,31 +1,6 @@ #!/usr/bin/env python3 -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the plugins 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 import json_parser import posixpath @@ -934,7 +909,7 @@ endif()""", "condition": "__qt_ltcg_detected", }, "msvc_mp": None, - "simulator_and_device": {"condition": "UIKIT AND NOT QT_UIKIT_SDK"}, + "simulator_and_device": {"condition": "UIKIT AND NOT QT_APPLE_SDK"}, "pkg-config": {"condition": "PKG_CONFIG_FOUND"}, "precompile_header": {"condition": "BUILD_WITH_PCH"}, "profile": None, @@ -1413,11 +1388,6 @@ def parseCommandLinePrefixes(ctx, data, cm_fh): cm_fh.write(f"qt_commandline_prefix({key} {data[key]})\n") -def parseCommandLineAssignments(ctx, data, cm_fh): - for key in data: - cm_fh.write(f"qt_commandline_assignment({key} {data[key]})\n") - - def processCommandLine(ctx, data, cm_fh): print(" commandline:") @@ -1439,8 +1409,7 @@ def processCommandLine(ctx, data, cm_fh): print(" prefix:") parseCommandLinePrefixes(ctx, commandLine["prefix"], cm_fh) if "assignments" in commandLine: - print(" assignments:") - parseCommandLineAssignments(ctx, commandLine["assignments"], cm_fh) + print(" assignments are ignored") def processInputs(ctx, data, cm_fh): |