diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-02-10 12:02:57 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2021-04-13 09:32:55 +0200 |
commit | 919dd97e835f469609a0710eb91f829a6d70e88c (patch) | |
tree | 90c9044585d8f9b71776a4cbf1f4ef4a34a7076b /src/webengine/api/qquickwebenginehistory_p_p.h | |
parent | 29d45bf2d105b43d8cedc923869960091771d2a1 (diff) |
Fix 'WebEngine' ambiguity for Qt6
'WebEngine' is a qml module, however name itself
is ambiguous. Thefore now with Qt6 and with cmake
port name the module as WebEngineQuick.
Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/api/qquickwebenginehistory_p_p.h')
-rw-r--r-- | src/webengine/api/qquickwebenginehistory_p_p.h | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/src/webengine/api/qquickwebenginehistory_p_p.h b/src/webengine/api/qquickwebenginehistory_p_p.h deleted file mode 100644 index 019c6f0ad..000000000 --- a/src/webengine/api/qquickwebenginehistory_p_p.h +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine 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$ -** -****************************************************************************/ - -#ifndef QQUICKWEBENGINEHISTORY_P_P_H -#define QQUICKWEBENGINEHISTORY_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -namespace QtWebEngineCore { -class WebContentsAdapter; -} - -QT_BEGIN_NAMESPACE -class QQuickWebEngineHistoryListModel; -class QQuickWebEngineViewPrivate; - -class QQuickWebEngineHistoryListModelPrivate { -public: - QQuickWebEngineHistoryListModelPrivate(QQuickWebEngineViewPrivate*); - virtual ~QQuickWebEngineHistoryListModelPrivate(); - - virtual int count() const; - virtual int index(int) const; - virtual int offsetForIndex(int) const; - - QtWebEngineCore::WebContentsAdapter *adapter() const; - - QQuickWebEngineViewPrivate *view; -}; - -class QQuickWebEngineBackHistoryListModelPrivate : public QQuickWebEngineHistoryListModelPrivate { -public: - QQuickWebEngineBackHistoryListModelPrivate(QQuickWebEngineViewPrivate*); - - int count() const override; - int index(int) const override; - int offsetForIndex(int) const override; -}; - -class QQuickWebEngineForwardHistoryListModelPrivate : public QQuickWebEngineHistoryListModelPrivate { -public: - QQuickWebEngineForwardHistoryListModelPrivate(QQuickWebEngineViewPrivate*); - - int count() const override; - int index(int) const override; - int offsetForIndex(int) const override; -}; - -class QQuickWebEngineHistoryPrivate { -public: - QQuickWebEngineHistoryPrivate(QQuickWebEngineViewPrivate*); - ~QQuickWebEngineHistoryPrivate(); - - QQuickWebEngineViewPrivate *m_view; - mutable QScopedPointer<QQuickWebEngineHistoryListModel> m_navigationModel; - mutable QScopedPointer<QQuickWebEngineHistoryListModel> m_backNavigationModel; - mutable QScopedPointer<QQuickWebEngineHistoryListModel> m_forwardNavigationModel; -}; - -QT_END_NAMESPACE - -#endif // QQUICKWEBENGINEHISTORY_P_P_H |