diff options
Diffstat (limited to 'src/designer/src/plugins/activeqt/qdesigneraxwidget.h')
| -rw-r--r-- | src/designer/src/plugins/activeqt/qdesigneraxwidget.h | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h index 8f74bfaea..ba0a8a53a 100644 --- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h +++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Designer 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 LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QACTIVEXPLUGINOBJECT_H #define QACTIVEXPLUGINOBJECT_H @@ -67,8 +42,8 @@ public: void setControl(const QString &clsid); QString control() const; - QSize sizeHint() const; - QSize minimumSizeHint() const; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; bool loaded() { return (m_axobject != 0); } @@ -80,7 +55,7 @@ public: void setDrawFlags(unsigned f) { m_drawFlags = f; } protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; QAxWidget *axobject() const { return m_axobject; } private: |