summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/moc/single_function_keyword.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/tools/moc/single_function_keyword.h')
-rw-r--r--tests/auto/tools/moc/single_function_keyword.h35
1 files changed, 8 insertions, 27 deletions
diff --git a/tests/auto/tools/moc/single_function_keyword.h b/tests/auto/tools/moc/single_function_keyword.h
index ec1a0ac628..0c907db9ef 100644
--- a/tests/auto/tools/moc/single_function_keyword.h
+++ b/tests/auto/tools/moc/single_function_keyword.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite 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
#ifndef SINGLE_FUNCTION_KEYWORD_H
#define SINGLE_FUNCTION_KEYWORD_H
@@ -47,7 +22,10 @@ class SingleFunctionKeywordBeforeInline : public QObject
public:
inline SingleFunctionKeywordBeforeInline() {}
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wundefined-inline")
Q_SIGNAL inline void mySignal();
+QT_WARNING_POP
Q_SLOT inline void mySlot() { emit mySignal(); }
};
@@ -58,7 +36,10 @@ class SingleFunctionKeywordAfterInline : public QObject
public:
inline SingleFunctionKeywordAfterInline() {}
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wundefined-inline")
inline Q_SIGNAL void mySignal();
+QT_WARNING_POP
inline Q_SLOT void mySlot() { emit mySignal(); }
};