summaryrefslogtreecommitdiffstats
path: root/lib/quick/plugin
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-11-19 17:55:49 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-28 16:15:59 +0100
commitfd61d752e313bf91a09c85020b3fb50067c610c8 (patch)
tree5aeff0a1039acc3e7bf7ced21870cac42d491f9e /lib/quick/plugin
parent84a400e80d7e40aba2853411fdfb22f244c3e728 (diff)
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 <ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>. - 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 <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib/quick/plugin')
-rw-r--r--lib/quick/plugin/experimental/experimental.pro15
-rw-r--r--lib/quick/plugin/experimental/plugin.cpp77
-rw-r--r--lib/quick/plugin/experimental/qmldir3
-rw-r--r--lib/quick/plugin/plugin.cpp64
-rw-r--r--lib/quick/plugin/plugin.pro13
-rw-r--r--lib/quick/plugin/qmldir3
6 files changed, 0 insertions, 175 deletions
diff --git a/lib/quick/plugin/experimental/experimental.pro b/lib/quick/plugin/experimental/experimental.pro
deleted file mode 100644
index ad2e0b8a3..000000000
--- a/lib/quick/plugin/experimental/experimental.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-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/lib/quick/plugin/experimental/plugin.cpp b/lib/quick/plugin/experimental/plugin.cpp
deleted file mode 100644
index 08d482508..000000000
--- a/lib/quick/plugin/experimental/plugin.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** 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 <QtQml/qqmlextensionplugin.h>
-
-#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<QQuickWebEngineView*>(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<QQuickWebEngineView, QQuickWebEngineViewExperimentalExtension>(uri, 1, 0, "WebEngineView");
- qmlRegisterUncreatableType<QQuickWebEngineViewExperimental>(uri, 1, 0, "WebEngineViewExperimental",
- QObject::tr("Cannot create a separate instance of WebEngineViewExperimental"));
- }
-};
-
-QT_END_NAMESPACE
-
-#include "plugin.moc"
diff --git a/lib/quick/plugin/experimental/qmldir b/lib/quick/plugin/experimental/qmldir
deleted file mode 100644
index 56ad22e70..000000000
--- a/lib/quick/plugin/experimental/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module QtWebEngine.experimental
-plugin qtwebengineexperimentalplugin
-typeinfo plugins.qmltypes
diff --git a/lib/quick/plugin/plugin.cpp b/lib/quick/plugin/plugin.cpp
deleted file mode 100644
index 5efde6dd8..000000000
--- a/lib/quick/plugin/plugin.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** 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 <QtQml/qqmlextensionplugin.h>
-
-#include "qquickwebengineview_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QtWebEnginePlugin : public QQmlExtensionPlugin
-{
- Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
-public:
- virtual void registerTypes(const char *uri) Q_DECL_OVERRIDE
- {
- Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine"));
- Q_UNUSED(uri);
-
- qmlRegisterType<QQuickWebEngineView>(uri, 1, 0, "WebEngineView");
- }
-};
-
-QT_END_NAMESPACE
-
-#include "plugin.moc"
diff --git a/lib/quick/plugin/plugin.pro b/lib/quick/plugin/plugin.pro
deleted file mode 100644
index 93e04f97a..000000000
--- a/lib/quick/plugin/plugin.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-CXX_MODULE = qml
-TARGET = qtwebengineplugin
-TARGETPATH = QtWebEngine
-IMPORT_VERSION = 1.0
-
-QT += webengine qml quick
-QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private
-
-INCLUDEPATH += $$QTWEBENGINE_ROOT/lib $$QTWEBENGINE_ROOT/lib/quick
-
-SOURCES = plugin.cpp
-
-load(qml_plugin)
diff --git a/lib/quick/plugin/qmldir b/lib/quick/plugin/qmldir
deleted file mode 100644
index e24f55ed9..000000000
--- a/lib/quick/plugin/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module QtWebEngine
-plugin qtwebengineplugin
-typeinfo plugins.qmltypes