diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-03-01 14:32:48 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2018-03-08 14:41:07 +0000 |
commit | 349d11dd83578b5baeec87e41c71f612e5bd21b3 (patch) | |
tree | f75acb8eceb571c24856800443ed3ac39fd3e6fb /src/webenginewidgets/api/qwebenginequotapermissionrequest.h | |
parent | 58b0b8d52222018c814b5e1c0d0d8cf648bca835 (diff) |
Move quota and registerProtocolHandler permission classes to core
- Move QWebEngineQuotaPermissionRequest and
QWebEngineRegisterProtocolHandlerPermissionRequest to QtWebEngineCore.
- Delete QQuickWebEngineQuotaPermissionRequest and
QQuickWebEngineRegisterProtocolHandlerPermissionRequest.
Miscellaneous cleanup:
- Mark QWebEngineQuotaPermissionRequest constructors as internal for QDoc.
- Remove superfluous Q_DECLARE_METATYPEs (implied by Q_GADGET).
- Remove Q_UNREACHABLE from default constructor.
For some reason QML seems to default construct an unused temporary object
before throwing it away and copy constructing the actual object. This triggers
Q_UNREACHABLE.
Change-Id: Icf9f4e34996e4c64aec65b734bcb3bbd22b4dc51
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginequotapermissionrequest.h')
-rw-r--r-- | src/webenginewidgets/api/qwebenginequotapermissionrequest.h | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/src/webenginewidgets/api/qwebenginequotapermissionrequest.h b/src/webenginewidgets/api/qwebenginequotapermissionrequest.h deleted file mode 100644 index ed6e9edc3..000000000 --- a/src/webenginewidgets/api/qwebenginequotapermissionrequest.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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 QWEBENGINEQUOTAPERMISSIONREQUEST_H -#define QWEBENGINEQUOTAPERMISSIONREQUEST_H - -#include <QtCore/qsharedpointer.h> -#include <QtCore/qurl.h> -#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> - -namespace QtWebEngineCore { - class QuotaPermissionController; -} - -QT_BEGIN_NAMESPACE - -class QWEBENGINEWIDGETS_EXPORT QWebEngineQuotaPermissionRequest { - Q_GADGET - Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) - Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL) -public: - explicit QWebEngineQuotaPermissionRequest() { Q_UNREACHABLE(); } - explicit QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller); - Q_INVOKABLE void accept(); - Q_INVOKABLE void reject(); - QUrl origin() const; - qint64 requestedSize() const; - -private: - QSharedPointer<QtWebEngineCore::QuotaPermissionController> d_ptr; -}; - -QT_END_NAMESPACE - -Q_DECLARE_METATYPE(QWebEngineQuotaPermissionRequest) - -#endif // QWEBENGINEQUOTAPERMISSIONREQUEST_H |