diff options
Diffstat (limited to 'src/widgets/widgets/qtextbrowser.h')
| -rw-r--r-- | src/widgets/widgets/qtextbrowser.h | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index 33e5b3980c..f8e9c0c301 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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: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 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 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. -** -** 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$ -** -****************************************************************************/ +// 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 QTEXTBROWSER_H #define QTEXTBROWSER_H @@ -90,12 +54,7 @@ public: void setOpenLinks(bool open); public Q_SLOTS: -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) - virtual void setSource(const QUrl &name); - void setSource(const QUrl &name, QTextDocument::ResourceType type); -#else void setSource(const QUrl &name, QTextDocument::ResourceType type = QTextDocument::UnknownResource); -#endif virtual void backward(); virtual void forward(); virtual void home(); @@ -107,7 +66,6 @@ Q_SIGNALS: void historyChanged(); void sourceChanged(const QUrl &); void highlighted(const QUrl &); - void highlighted(const QString &); void anchorClicked(const QUrl &); protected: @@ -119,17 +77,11 @@ protected: virtual void focusOutEvent(QFocusEvent *ev) override; virtual bool focusNextPrevChild(bool next) override; virtual void paintEvent(QPaintEvent *e) override; -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) - virtual -#endif - void doSetSource(const QUrl &name, QTextDocument::ResourceType type = QTextDocument::UnknownResource); + virtual void doSetSource(const QUrl &name, QTextDocument::ResourceType type = QTextDocument::UnknownResource); private: Q_DISABLE_COPY(QTextBrowser) Q_DECLARE_PRIVATE(QTextBrowser) - Q_PRIVATE_SLOT(d_func(), void _q_documentModified()) - Q_PRIVATE_SLOT(d_func(), void _q_activateAnchor(const QString &)) - Q_PRIVATE_SLOT(d_func(), void _q_highlightLink(const QString &)) }; QT_END_NAMESPACE |