From 402e47745636a36419b021385f137f5ceaa65f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Tue, 27 Feb 2024 15:10:07 +0100 Subject: Rename files for header generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.7 Task-number: QTBUG-121039 Change-Id: I45eec26e93e5aa3e4a08ef4b326427338f63e3f2 Reviewed-by: Kai Köhne --- src/tools/moc/util/generate.sh | 4 ++-- src/tools/moc/util/licenseheader.cpp.in | 3 +++ src/tools/moc/util/licenseheader.txt | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/tools/moc/util/licenseheader.cpp.in delete mode 100644 src/tools/moc/util/licenseheader.txt (limited to 'src/tools') diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 4514ca4930..6be06e5a91 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -6,7 +6,7 @@ set -ex qmake make -cat licenseheader.txt > ../keywords.cpp -cat licenseheader.txt > ../ppkeywords.cpp +cat licenseheader.cpp.in > ../keywords.cpp +cat licenseheader.cpp.in > ../ppkeywords.cpp ./generate_keywords >> ../keywords.cpp ./generate_keywords preprocessor >> ../ppkeywords.cpp diff --git a/src/tools/moc/util/licenseheader.cpp.in b/src/tools/moc/util/licenseheader.cpp.in new file mode 100644 index 0000000000..42958a66f5 --- /dev/null +++ b/src/tools/moc/util/licenseheader.cpp.in @@ -0,0 +1,3 @@ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + diff --git a/src/tools/moc/util/licenseheader.txt b/src/tools/moc/util/licenseheader.txt deleted file mode 100644 index 42958a66f5..0000000000 --- a/src/tools/moc/util/licenseheader.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -- cgit v1.2.3