You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2016/01/28 15:53:14 UTC
[10/12] cordova-ubuntu git commit: Fix reliance on deprecated Oxide's
onLoadingChanged signal
Fix reliance on deprecated Oxide's onLoadingChanged signal
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/3cb35508
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/3cb35508
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/3cb35508
Branch: refs/heads/master
Commit: 3cb3550895f216b78fdd0053d70acb2acd8a1705
Parents: 848bf80
Author: Alexandre Abreu <al...@canonical.com>
Authored: Tue Jan 26 11:25:39 2016 -0500
Committer: David Barth <da...@canonical.com>
Committed: Thu Jan 28 12:22:35 2016 +0100
----------------------------------------------------------------------
CordovaUbuntu/CordovaViewInternal.qml | 10 +++++-----
src/coreplugins.cpp | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/3cb35508/CordovaUbuntu/CordovaViewInternal.qml
----------------------------------------------------------------------
diff --git a/CordovaUbuntu/CordovaViewInternal.qml b/CordovaUbuntu/CordovaViewInternal.qml
index 62d354b..f655571 100644
--- a/CordovaUbuntu/CordovaViewInternal.qml
+++ b/CordovaUbuntu/CordovaViewInternal.qml
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
*
*/
import QtQuick 2.0
-import com.canonical.Oxide 1.0
+import com.canonical.Oxide 1.10
import "cordova_wrapper.js" as CordovaWrapper
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Components.Popups 1.0
OrientationHelper {
id: root
@@ -129,7 +129,7 @@ OrientationHelper {
cordova.setTitle(webView.title)
}
- onLoadingChanged: {
+ onLoadingStateChanged: {
if (!webView.loading) {
root.completed()
cordova.loadFinished(true)
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/3cb35508/src/coreplugins.cpp
----------------------------------------------------------------------
diff --git a/src/coreplugins.cpp b/src/coreplugins.cpp
index fc1a115..646eafe 100644
--- a/src/coreplugins.cpp
+++ b/src/coreplugins.cpp
@@ -26,7 +26,7 @@ INSERT_HEADER_HERE
extern "C" {
-Q_DECL_EXPORT QList<QSharedPointer<CPlugin>> cordovaGetPluginInstances(Cordova *cordova) {
+Q_DECL_EXPORT QList<QSharedPointer<CPlugin>> cordovaGetPluginInstances(Cordova *) {
QList<QSharedPointer<CPlugin>> res;
INSERT_PLUGIN_HERE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org