From fd61d752e313bf91a09c85020b3fb50067c610c8 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 19 Nov 2013 17:55:49 +0100 Subject: Moving sources to src part 1: Move files. This only move files without adjusting any paths. This moves: - lib/quick -> src/webengine/api (API files) lib/quick -> src/webengine (other files) This contains the main QtWebEngine module library since . - lib/widgets -> src/webenginewidgets Also rename this directory to match its module name and rename Api to api. - lib -> src/core - process -> src/process - resources -> src/core/resources - tools/* -> tools/scripts/ The build directory is spread as follow: - build/build.pro -> src/core/gyp_run.pro - build/qmake_extras/* -> src/core/ (for the host and target .pro files) - build/qmake -> tools/qmake - Build related scripts -> tools/buildscripts Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1 Reviewed-by: Zeno Albisser Reviewed-by: Pierre Rossi Reviewed-by: Andras Becsi --- src/webengine/plugin/experimental/experimental.pro | 15 +++++ src/webengine/plugin/experimental/plugin.cpp | 77 ++++++++++++++++++++++ src/webengine/plugin/experimental/qmldir | 3 + 3 files changed, 95 insertions(+) create mode 100644 src/webengine/plugin/experimental/experimental.pro create mode 100644 src/webengine/plugin/experimental/plugin.cpp create mode 100644 src/webengine/plugin/experimental/qmldir (limited to 'src/webengine/plugin/experimental') diff --git a/src/webengine/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro new file mode 100644 index 000000000..ad2e0b8a3 --- /dev/null +++ b/src/webengine/plugin/experimental/experimental.pro @@ -0,0 +1,15 @@ +CXX_MODULE = qml +TARGET = qtwebengineexperimentalplugin +TARGETPATH = QtWebEngine/experimental +IMPORT_VERSION = 1.0 + +QT += webengine qml quick +QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private + +qtHaveModule(v8): QT_PRIVATE += v8-private + +INCLUDEPATH += $$QTWEBENGINE_ROOT/lib $$QTWEBENGINE_ROOT/lib/quick + +SOURCES = plugin.cpp + +load(qml_plugin) diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp new file mode 100644 index 000000000..08d482508 --- /dev/null +++ b/src/webengine/plugin/experimental/plugin.cpp @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 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$ +** +****************************************************************************/ + +#include + +#include "qquickwebengineview_p.h" +#include "qquickwebengineview_p_p.h" + +QT_BEGIN_NAMESPACE + +class QQuickWebEngineViewExperimentalExtension : public QObject { + Q_OBJECT + Q_PROPERTY(QQuickWebEngineViewExperimental* experimental READ experimental CONSTANT FINAL) +public: + QQuickWebEngineViewExperimentalExtension(QObject *parent = 0) : QObject(parent) { } + QQuickWebEngineViewExperimental* experimental() { return static_cast(parent())->d_func()->experimental(); } +}; + +class QtWebEngineExperimentalPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") +public: + virtual void registerTypes(const char *uri) + { + qWarning("\nWARNING: This project is using the experimental QML API extensions for QtWebEngine and is therefore tied to a specific QtWebEngine release.\n" + "WARNING: The experimental API will change from version to version, or even be removed. You have been warned!\n"); + + Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine.experimental")); + + qmlRegisterExtendedType(uri, 1, 0, "WebEngineView"); + qmlRegisterUncreatableType(uri, 1, 0, "WebEngineViewExperimental", + QObject::tr("Cannot create a separate instance of WebEngineViewExperimental")); + } +}; + +QT_END_NAMESPACE + +#include "plugin.moc" diff --git a/src/webengine/plugin/experimental/qmldir b/src/webengine/plugin/experimental/qmldir new file mode 100644 index 000000000..56ad22e70 --- /dev/null +++ b/src/webengine/plugin/experimental/qmldir @@ -0,0 +1,3 @@ +module QtWebEngine.experimental +plugin qtwebengineexperimentalplugin +typeinfo plugins.qmltypes -- cgit v1.2.3