diff options
| author | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 15:58:49 +0200 |
|---|---|---|
| committer | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 16:26:18 +0200 |
| commit | feabda3aa78b7861ae03f1cc2296e8adf34ba038 (patch) | |
| tree | 9bc06c7eeb6fca92e8cdd273908f7350260a8cb8 /scripts/makedmg.py | |
| parent | 359ea5d55a9452d70c20754c2380b1bf1c704c04 (diff) | |
| parent | f7639f458a4b87263e96de70f26554a660148bc3 (diff) | |
Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
src/plugins/qmldesigner/CMakeLists.txt
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
Diffstat (limited to 'scripts/makedmg.py')
| -rwxr-xr-x | scripts/makedmg.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makedmg.py b/scripts/makedmg.py index 39cd6d1acf4..9d7fd7f5f57 100755 --- a/scripts/makedmg.py +++ b/scripts/makedmg.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # Copyright (C) 2018 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import argparse import os |