From 003596fad52690127afca0d7025b62bad7fd013e Mon Sep 17 00:00:00 2001
From: Milian Wolff <milian.wolff@kdab.com>
Date: Thu, 3 Jul 2014 19:17:02 +0200
Subject: Make the QWebChannel QML API publically accessible.

This is required for proper QtWebKit/QtWebEngine integration, as
otherwise these modules would have to redo a lot of the QtWebChannel
QML API. Furthermore, without this, we could not use the WebChannel.id
attached property everywhere, independent of the web browser technology.

Change-Id: I032a9326841d505c2f77959a240bbfc71e94b6e8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/webchannel/qqmlwebchannelattached_p.h | 72 +++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 src/webchannel/qqmlwebchannelattached_p.h

(limited to 'src/webchannel/qqmlwebchannelattached_p.h')

diff --git a/src/webchannel/qqmlwebchannelattached_p.h b/src/webchannel/qqmlwebchannelattached_p.h
new file mode 100644
index 0000000..09d18d3
--- /dev/null
+++ b/src/webchannel/qqmlwebchannelattached_p.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebChannel 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 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.
+**
+** 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 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: 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
+** 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 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLWEBCHANNELATTACHED_H
+#define QQMLWEBCHANNELATTACHED_H
+
+#include <QObject>
+
+#include "qwebchannelglobal.h"
+
+QT_BEGIN_NAMESPACE
+
+class Q_WEBCHANNEL_EXPORT QQmlWebChannelAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY( QString id READ id WRITE setId NOTIFY idChanged FINAL )
+public:
+    explicit QQmlWebChannelAttached(QObject *parent = 0);
+    virtual ~QQmlWebChannelAttached();
+
+    QString id() const;
+    void setId(const QString &id);
+
+Q_SIGNALS:
+    void idChanged(const QString &id);
+
+private:
+    QString m_id;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLWEBCHANNELATTACHED_H
-- 
cgit v1.2.1