diff options
author | Katja Marttila <katja.marttila@theqtcompany.com> | 2015-12-22 10:46:54 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-01-19 14:25:37 +0000 |
commit | d40942e1d31dc38c101217dc3a0bc18d88bf0c99 (patch) | |
tree | 08cde233aee42c620dd7abe330710c236bf104d3 /basicsuite/qtwebbrowser | |
parent | 81394ec7d5f0b713deb434ade46d0e71bd733cc5 (diff) |
add browser demo
qtwebbrowser will be imported as submodule
Change-Id: Iebbc9a66bcb74d730b1fb4ef7ed5938fc7e67542
Task-Id: QTRD-3794
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Diffstat (limited to 'basicsuite/qtwebbrowser')
-rw-r--r-- | basicsuite/qtwebbrowser/description.txt | 3 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/exclude.txt | 4 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/main.qml | 5 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/plugin.cpp | 80 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/preview_l.jpg | bin | 0 -> 25655 bytes | |||
-rw-r--r-- | basicsuite/qtwebbrowser/qmldir | 4 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/qtwebbrowser.pro | 27 | ||||
-rw-r--r-- | basicsuite/qtwebbrowser/title.txt | 1 | ||||
m--------- | basicsuite/qtwebbrowser/tqtc-qtwebbrowser | 0 |
9 files changed, 124 insertions, 0 deletions
diff --git a/basicsuite/qtwebbrowser/description.txt b/basicsuite/qtwebbrowser/description.txt new file mode 100644 index 0000000..0a4cf41 --- /dev/null +++ b/basicsuite/qtwebbrowser/description.txt @@ -0,0 +1,3 @@ +This example demonstrates the use of the QtWebEngine WebView with Qt Quick. + +Demo can be used to browse the internet (working network connection required) or run the offline web page demos. diff --git a/basicsuite/qtwebbrowser/exclude.txt b/basicsuite/qtwebbrowser/exclude.txt new file mode 100644 index 0000000..f5dba0c --- /dev/null +++ b/basicsuite/qtwebbrowser/exclude.txt @@ -0,0 +1,4 @@ +linux-emulator +linux-raspberrypi +linux-beaglebone +linux-colibri-vf diff --git a/basicsuite/qtwebbrowser/main.qml b/basicsuite/qtwebbrowser/main.qml new file mode 100644 index 0000000..dcca154 --- /dev/null +++ b/basicsuite/qtwebbrowser/main.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +Loader { + source: "tqtc-qtwebbrowser/src/qml/BrowserWindow.qml" +} diff --git a/basicsuite/qtwebbrowser/plugin.cpp b/basicsuite/qtwebbrowser/plugin.cpp new file mode 100644 index 0000000..bcb30b8 --- /dev/null +++ b/basicsuite/qtwebbrowser/plugin.cpp @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtBrowser project. +** +** $QT_BEGIN_LICENSE:GPL$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPLv2 included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. +** +** 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 "touchtracker.h" +#include "navigationhistoryproxymodel.h" +#include "appengine.h" + +#include <QtQml/QQmlExtensionPlugin> + +QT_BEGIN_NAMESPACE + +static QObject *engine_factory(QQmlEngine *engine, QJSEngine *scriptEngine) +{ + Q_UNUSED(engine); + Q_UNUSED(scriptEngine); + AppEngine *eng = new AppEngine(); + return eng; +} + + + +class WebBrowser : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") +public: + virtual void registerTypes(const char *uri) + { + if (uri == QLatin1String("WebBrowser")) { + qmlRegisterType<TouchTracker>(uri, 1, 0, "TouchTracker"); + qmlRegisterType<NavigationHistoryProxyModel>(uri, 1, 0, "SearchProxyModel"); + qmlRegisterSingletonType<AppEngine>(uri, 1, 0, "AppEngine", engine_factory); + } + } + + virtual void initializeEngine(QQmlEngine *engine, const char *uri) + { + Q_UNUSED(engine); + Q_UNUSED(uri); + } +}; + +QT_END_NAMESPACE + +#include "plugin.moc" + diff --git a/basicsuite/qtwebbrowser/preview_l.jpg b/basicsuite/qtwebbrowser/preview_l.jpg Binary files differnew file mode 100644 index 0000000..e96d576 --- /dev/null +++ b/basicsuite/qtwebbrowser/preview_l.jpg diff --git a/basicsuite/qtwebbrowser/qmldir b/basicsuite/qtwebbrowser/qmldir new file mode 100644 index 0000000..89b8c78 --- /dev/null +++ b/basicsuite/qtwebbrowser/qmldir @@ -0,0 +1,4 @@ +module WebBrowser +plugin webbrowser +class WebBrowser + diff --git a/basicsuite/qtwebbrowser/qtwebbrowser.pro b/basicsuite/qtwebbrowser/qtwebbrowser.pro new file mode 100644 index 0000000..8532344 --- /dev/null +++ b/basicsuite/qtwebbrowser/qtwebbrowser.pro @@ -0,0 +1,27 @@ +TEMPLATE = lib +TARGET = webbrowser +QT += qml quick +CONFIG += qt plugin + +INCLUDEPATH += tqtc-qtwebbrowser/src + +HEADERS += \ + tqtc-qtwebbrowser/src/appengine.h \ + tqtc-qtwebbrowser/src/touchtracker.h \ + tqtc-qtwebbrowser/src/navigationhistoryproxymodel.h + +SOURCES += \ + plugin.cpp \ + tqtc-qtwebbrowser/src/appengine.cpp \ + tqtc-qtwebbrowser/src/touchtracker.cpp \ + tqtc-qtwebbrowser/src/navigationhistoryproxymodel.cpp + +pluginfiles.files += \ + qmldir + +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/WebBrowser + +target.path = $$B2QT_DEPLOYPATH +pluginfiles.path = $$B2QT_DEPLOYPATH + +INSTALLS += target pluginfiles diff --git a/basicsuite/qtwebbrowser/title.txt b/basicsuite/qtwebbrowser/title.txt new file mode 100644 index 0000000..cb3e9f2 --- /dev/null +++ b/basicsuite/qtwebbrowser/title.txt @@ -0,0 +1 @@ +900. Web Browser diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser new file mode 160000 +Subproject 60a8ef724c11c35413d42ef1ccd118e9c4f6c3c |