diff options
Diffstat (limited to 'src/widgets/graphicsview/qgraphicswidget.cpp')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget.cpp | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 98e011ff05..6f10e2854c 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ @@ -694,7 +694,7 @@ void QGraphicsWidget::initStyleOption(QStyleOption *option) const option->state |= QStyle::State_Window; /* ### -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC extern bool qt_mac_can_clickThrough(const QGraphicsWidget *w); //qwidget_mac.cpp if (!(option->state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget)) option->state &= ~QStyle::State_Enabled; @@ -1994,7 +1994,11 @@ void QGraphicsWidget::addAction(QAction *action) \sa removeAction(), QMenu, addAction(), QWidget::addActions() */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +void QGraphicsWidget::addActions(const QList<QAction *> &actions) +#else void QGraphicsWidget::addActions(QList<QAction *> actions) +#endif { for (int i = 0; i < actions.count(); ++i) insertAction(0, actions.at(i)); @@ -2390,18 +2394,6 @@ bool QGraphicsWidget::close() return true; } -#ifdef Q_NO_USING_KEYWORD -/*! - \fn const QObjectList &QGraphicsWidget::children() const - \internal - - This function returns the same value as QObject::children(). It's - provided to differentiate between the obsolete member - QGraphicsItem::children() and QObject::children(). QGraphicsItem now - provides childItems() instead. -*/ -#endif - #if 0 void QGraphicsWidget::dumpFocusChain() { |