incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkorma...@apache.org
Subject [8/8] qt commit: Quick fix for current webkit2 master
Date Mon, 19 Mar 2012 12:01:23 GMT
Quick fix for current webkit2 master


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/commit/ee8ea6e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/tree/ee8ea6e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/diff/ee8ea6e4

Branch: refs/heads/master
Commit: ee8ea6e467c38ca46c98c2204fd85d47d59b1722
Parents: 7b6e056
Author: Denis Kormalev <dkormalev@ics.com>
Authored: Fri Mar 16 19:21:53 2012 +0400
Committer: Denis Kormalev <dkormalev@ics.com>
Committed: Fri Mar 16 19:21:53 2012 +0400

----------------------------------------------------------------------
 qml/main_qt5.qml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/blob/ee8ea6e4/qml/main_qt5.qml
----------------------------------------------------------------------
diff --git a/qml/main_qt5.qml b/qml/main_qt5.qml
index c9e805f..86bfa48 100644
--- a/qml/main_qt5.qml
+++ b/qml/main_qt5.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtWebKit 3.0
-import QtWebKit.experimental 3.0
+import QtWebKit.experimental 1.0
 import "cordova_wrapper.js" as CordovaWrapper
 
 WebView {
@@ -16,15 +16,19 @@ WebView {
     }
     //Uncomment when it will be available
     //experimental.setFlickableViewportEnabled: false
-    experimental.useTraditionalDesktopBehaviour: true
+//    experimental.useTraditionalDesktopBehaviour: true
 
 
     Component.onCompleted: {
-        webView.load(cordova.mainUrl)
+        webView.url = cordova.mainUrl
     }
 
-    onLoadSucceeded: cordova.loadFinished(true)
-    onLoadFailed: cordova.loadFinished(false)
+
+    //TODO: check here for errors
+    onLoadingChanged: cordova.loadFinished(true)
+
+//    onLoadSucceeded: cordova.loadFinished(true)
+//    onLoadFailed: cordova.loadFinished(false)
 
     Connections {
         target: cordova


Mime
View raw message