diff options
Diffstat (limited to 'src/widgets/styles/qstyleoption.h')
-rw-r--r-- | src/widgets/styles/qstyleoption.h | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 74dd35cc4a..8f41f379bc 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL$ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -131,8 +137,8 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionFrame::FrameFeatures) -typedef QStyleOptionFrame QStyleOptionFrameV2; -typedef QStyleOptionFrame QStyleOptionFrameV3; +typedef Q_DECL_DEPRECATED QStyleOptionFrame QStyleOptionFrameV2; +typedef Q_DECL_DEPRECATED QStyleOptionFrame QStyleOptionFrameV3; #ifndef QT_NO_TABWIDGET class Q_WIDGETS_EXPORT QStyleOptionTabWidgetFrame : public QStyleOption @@ -158,7 +164,7 @@ protected: QStyleOptionTabWidgetFrame(int version); }; -typedef QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrameV2; +typedef Q_DECL_DEPRECATED QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrameV2; #endif // QT_NO_TABWIDGET @@ -181,7 +187,7 @@ protected: QStyleOptionTabBarBase(int version); }; -typedef QStyleOptionTabBarBase QStyleOptionTabBarBaseV2; +typedef Q_DECL_DEPRECATED QStyleOptionTabBarBase QStyleOptionTabBarBaseV2; #endif // QT_NO_TABBAR class Q_WIDGETS_EXPORT QStyleOptionHeader : public QStyleOption @@ -273,8 +279,8 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionTab::CornerWidgets) -typedef QStyleOptionTab QStyleOptionTabV2; -typedef QStyleOptionTab QStyleOptionTabV3; +typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV2; +typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV3; #endif // QT_NO_TABBAR @@ -328,7 +334,7 @@ protected: QStyleOptionProgressBar(int version); }; -typedef QStyleOptionProgressBar QStyleOptionProgressBarV2; +typedef Q_DECL_DEPRECATED QStyleOptionProgressBar QStyleOptionProgressBarV2; class Q_WIDGETS_EXPORT QStyleOptionMenuItem : public QStyleOption { @@ -377,7 +383,7 @@ protected: QStyleOptionDockWidget(int version); }; -typedef QStyleOptionDockWidget QStyleOptionDockWidgetV2; +typedef Q_DECL_DEPRECATED QStyleOptionDockWidget QStyleOptionDockWidgetV2; #ifndef QT_NO_ITEMVIEWS @@ -430,9 +436,9 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionViewItem::ViewItemFeatures) -typedef QStyleOptionViewItem QStyleOptionViewItemV2; -typedef QStyleOptionViewItem QStyleOptionViewItemV3; -typedef QStyleOptionViewItem QStyleOptionViewItemV4; +typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV2; +typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV3; +typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV4; #endif // QT_NO_ITEMVIEWS @@ -458,7 +464,7 @@ protected: QStyleOptionToolBox(int version); }; -typedef QStyleOptionToolBox QStyleOptionToolBoxV2; +typedef Q_DECL_DEPRECATED QStyleOptionToolBox QStyleOptionToolBoxV2; #ifndef QT_NO_RUBBERBAND class Q_WIDGETS_EXPORT QStyleOptionRubberBand : public QStyleOption |