Modified to use modern WebView.
This commit is contained in:
parent
4b98361fda
commit
90f92722be
4 changed files with 20 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1,3 @@
|
||||||
*.user
|
*.user
|
||||||
README.md
|
README.md
|
||||||
|
harbour-tooterb.pro.user
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
import QtQuick 2.0
|
import QtQuick 2.0
|
||||||
import QtWebKit 3.0
|
// import QtWebKit 3.0
|
||||||
import Sailfish.Silica 1.0
|
import Sailfish.Silica 1.0
|
||||||
|
import Sailfish.WebView 1.0
|
||||||
|
import Sailfish.WebEngine 1.0
|
||||||
import "../lib/API.js" as Logic
|
import "../lib/API.js" as Logic
|
||||||
|
|
||||||
|
|
||||||
|
@ -90,17 +92,23 @@ Page {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
WebView {
|
||||||
SilicaWebView {
|
|
||||||
id: webView
|
id: webView
|
||||||
|
|
||||||
|
/* This will probably be required from 4.4 on. */
|
||||||
|
Component.onCompleted: {
|
||||||
|
WebEngineSettings.setPreference("security.disable_cors_checks", true, WebEngineSettings.BoolPref)
|
||||||
|
WebEngineSettings.setPreference("security.fileuri.strict_origin_policy", false, WebEngineSettings.BoolPref)
|
||||||
|
}
|
||||||
visible: false
|
visible: false
|
||||||
opacity: 0
|
//opacity: 0
|
||||||
anchors {
|
anchors {
|
||||||
top: parent.top
|
top: parent.top
|
||||||
left: parent.left
|
left: parent.left
|
||||||
right: parent.right
|
right: parent.right
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
}
|
}
|
||||||
|
|
||||||
onLoadingChanged: {
|
onLoadingChanged: {
|
||||||
console.log(url)
|
console.log(url)
|
||||||
if (
|
if (
|
||||||
|
@ -136,7 +144,7 @@ Page {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
switch (loadRequest.status)
|
/*switch (loadRequest.status)
|
||||||
{
|
{
|
||||||
case WebView.LoadSucceededStatus:
|
case WebView.LoadSucceededStatus:
|
||||||
opacity = 1
|
opacity = 1
|
||||||
|
@ -147,7 +155,7 @@ Page {
|
||||||
default:
|
default:
|
||||||
//opacity = 0
|
//opacity = 0
|
||||||
break
|
break
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
FadeAnimation on opacity {}
|
FadeAnimation on opacity {}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# Do NOT Edit the Auto-generated Part!
|
# Do NOT Edit the Auto-generated Part!
|
||||||
# Generated by: spectacle version 0.27
|
# Generated by: spectacle version 0.32
|
||||||
#
|
#
|
||||||
|
|
||||||
Name: harbour-tooterb
|
Name: harbour-tooterb
|
||||||
|
@ -21,6 +21,8 @@ URL: http://example.org/
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Source100: harbour-tooterb.yaml
|
Source100: harbour-tooterb.yaml
|
||||||
Requires: sailfishsilica-qt5 >= 0.10.9
|
Requires: sailfishsilica-qt5 >= 0.10.9
|
||||||
|
Requires: nemo-qml-plugin-configuration-qt5
|
||||||
|
Requires: nemo-qml-plugin-notifications-qt5
|
||||||
BuildRequires: pkgconfig(sailfishapp) >= 1.0.2
|
BuildRequires: pkgconfig(sailfishapp) >= 1.0.2
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
BuildRequires: pkgconfig(Qt5Qml)
|
BuildRequires: pkgconfig(Qt5Qml)
|
||||||
|
|
|
@ -27,7 +27,8 @@ PkgConfigBR:
|
||||||
- Qt5Quick
|
- Qt5Quick
|
||||||
- Qt5DBus
|
- Qt5DBus
|
||||||
- Qt5Multimedia
|
- Qt5Multimedia
|
||||||
- nemonotifications-qt5
|
#- nemonotifications-qt5 nemo-qml-plugin-notifications-qt5
|
||||||
|
- nemo-qml-plugin-notifications-qt5-devel
|
||||||
- openssl
|
- openssl
|
||||||
|
|
||||||
# Build dependencies without a pkgconfig setup can be listed here
|
# Build dependencies without a pkgconfig setup can be listed here
|
||||||
|
|
Loading…
Reference in a new issue