Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0508D9DA9 for ; Mon, 19 Mar 2012 12:01:25 +0000 (UTC) Received: (qmail 60447 invoked by uid 500); 19 Mar 2012 12:01:24 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 60404 invoked by uid 500); 19 Mar 2012 12:01:24 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 60318 invoked by uid 99); 19 Mar 2012 12:01:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2012 12:01:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C78FC7CCF; Mon, 19 Mar 2012 12:01:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkormalev@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [8/8] qt commit: Quick fix for current webkit2 master Message-Id: <20120319120123.C78FC7CCF@tyr.zones.apache.org> Date: Mon, 19 Mar 2012 12:01:23 +0000 (UTC) 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 Authored: Fri Mar 16 19:21:53 2012 +0400 Committer: Denis Kormalev 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