diff options
Diffstat (limited to 'src/tools/moc')
-rw-r--r-- | src/tools/moc/cbordevice.h | 2 | ||||
-rw-r--r-- | src/tools/moc/collectjson.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/collectjson.h | 2 | ||||
-rw-r--r-- | src/tools/moc/generator.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/generator.h | 2 | ||||
-rw-r--r-- | src/tools/moc/keywords.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/main.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/moc.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/moc.h | 2 | ||||
-rw-r--r-- | src/tools/moc/outputrevision.h | 2 | ||||
-rw-r--r-- | src/tools/moc/parser.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/parser.h | 2 | ||||
-rw-r--r-- | src/tools/moc/ppkeywords.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/preprocessor.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/preprocessor.h | 2 | ||||
-rw-r--r-- | src/tools/moc/symbols.h | 2 | ||||
-rw-r--r-- | src/tools/moc/token.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/token.h | 2 | ||||
-rwxr-xr-x | src/tools/moc/util/generate.sh | 2 | ||||
-rw-r--r-- | src/tools/moc/util/generate_keywords.cpp | 2 | ||||
-rw-r--r-- | src/tools/moc/util/licenseheader.txt | 2 | ||||
-rw-r--r-- | src/tools/moc/utils.h | 2 |
22 files changed, 22 insertions, 22 deletions
diff --git a/src/tools/moc/cbordevice.h b/src/tools/moc/cbordevice.h index 0ad4559fa05..f221968911a 100644 --- a/src/tools/moc/cbordevice.h +++ b/src/tools/moc/cbordevice.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef CBORDEVICE_H #define CBORDEVICE_H diff --git a/src/tools/moc/collectjson.cpp b/src/tools/moc/collectjson.cpp index e79d303b67d..d542e2abc4c 100644 --- a/src/tools/moc/collectjson.cpp +++ b/src/tools/moc/collectjson.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <qfile.h> #include <qjsonarray.h> diff --git a/src/tools/moc/collectjson.h b/src/tools/moc/collectjson.h index b77dbd4b970..b16ae615197 100644 --- a/src/tools/moc/collectjson.h +++ b/src/tools/moc/collectjson.h @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef COLLECTJSON_H #define COLLECTJSON_H diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 7cd0e192b19..5545cde3e8b 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // Copyright (C) 2019 Olivier Goffart <[email protected]> // Copyright (C) 2018 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "generator.h" #include "cbordevice.h" diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h index 83aaf2d533e..fa651f04a0a 100644 --- a/src/tools/moc/generator.h +++ b/src/tools/moc/generator.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef GENERATOR_H #define GENERATOR_H diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp index 4378e9f0b57..9d82da7a26b 100644 --- a/src/tools/moc/keywords.cpp +++ b/src/tools/moc/keywords.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // auto generated // DO NOT EDIT. diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index dd164a30c69..3df832cc2e8 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2016 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <depfile_shared.h> #include "preprocessor.h" diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index de136d6c43b..8803e76b008 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2019 Olivier Goffart <[email protected]> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "moc.h" #include "generator.h" diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index d05416a089f..534cba7b81a 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef MOC_H #define MOC_H diff --git a/src/tools/moc/outputrevision.h b/src/tools/moc/outputrevision.h index 0d30682f974..3bc5a872ed2 100644 --- a/src/tools/moc/outputrevision.h +++ b/src/tools/moc/outputrevision.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef OUTPUTREVISION_H #define OUTPUTREVISION_H diff --git a/src/tools/moc/parser.cpp b/src/tools/moc/parser.cpp index a29dbe730e0..6b0308fc15d 100644 --- a/src/tools/moc/parser.cpp +++ b/src/tools/moc/parser.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "parser.h" #include "utils.h" diff --git a/src/tools/moc/parser.h b/src/tools/moc/parser.h index 10757e88e95..2546370cb08 100644 --- a/src/tools/moc/parser.h +++ b/src/tools/moc/parser.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef PARSER_H #define PARSER_H diff --git a/src/tools/moc/ppkeywords.cpp b/src/tools/moc/ppkeywords.cpp index 39b812f8779..dc13f3db95d 100644 --- a/src/tools/moc/ppkeywords.cpp +++ b/src/tools/moc/ppkeywords.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // auto generated // DO NOT EDIT. diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index e34c2624619..486c969798f 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2014 Olivier Goffart <[email protected]> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "preprocessor.h" #include "utils.h" diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h index 9796ac5a836..624b00ff105 100644 --- a/src/tools/moc/preprocessor.h +++ b/src/tools/moc/preprocessor.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef PREPROCESSOR_H #define PREPROCESSOR_H diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h index a0e956510ea..c02f306c12e 100644 --- a/src/tools/moc/symbols.h +++ b/src/tools/moc/symbols.h @@ -1,6 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2013 Olivier Goffart <[email protected]> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef SYMBOLS_H #define SYMBOLS_H diff --git a/src/tools/moc/token.cpp b/src/tools/moc/token.cpp index c817b2e7a3d..bfefaff57bb 100644 --- a/src/tools/moc/token.cpp +++ b/src/tools/moc/token.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "token.h" diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h index fe756da146f..a58b2e9f9f2 100644 --- a/src/tools/moc/token.h +++ b/src/tools/moc/token.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef TOKEN_H #define TOKEN_H diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 10baa544d2d..4514ca4930b 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -1,6 +1,6 @@ #!/bin/sh # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 set -ex diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index c152c1d6edb..fb78ae87d02 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <stdio.h> #include <string.h> #include <qbytearray.h> diff --git a/src/tools/moc/util/licenseheader.txt b/src/tools/moc/util/licenseheader.txt index ab510e292a6..42958a66f5f 100644 --- a/src/tools/moc/util/licenseheader.txt +++ b/src/tools/moc/util/licenseheader.txt @@ -1,3 +1,3 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h index f42f3a06c6a..cb118fab38b 100644 --- a/src/tools/moc/utils.h +++ b/src/tools/moc/utils.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef UTILS_H #define UTILS_H |