cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dba...@apache.org
Subject [2/5] cordova-ubuntu git commit: Fix reliance on deprecated Oxide's onLoadingChanged signal
Date Thu, 28 Jan 2016 11:40:43 GMT
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/47dd580b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/47dd580b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/47dd580b

Branch: refs/heads/4.3.x
Commit: 47dd580bba932bb4a265ed19b928d518117eaac0
Parents: 906c64e
Author: Alexandre Abreu <alexandre.abreu@canonical.com>
Authored: Tue Jan 26 11:25:39 2016 -0500
Committer: David Barth <david.barth@canonical.com>
Committed: Thu Jan 28 12:38:32 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/47dd580b/CordovaUbuntu/CordovaViewInternal.qml
----------------------------------------------------------------------
diff --git a/CordovaUbuntu/CordovaViewInternal.qml b/CordovaUbuntu/CordovaViewInternal.qml
index 42f7389..87f5fac 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/47dd580b/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


Mime
View raw message