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 8B6FF9728 for ; Fri, 24 Feb 2012 20:52:55 +0000 (UTC) Received: (qmail 15234 invoked by uid 500); 24 Feb 2012 20:52:55 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 15208 invoked by uid 500); 24 Feb 2012 20:52:55 -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 15201 invoked by uid 99); 24 Feb 2012 20:52:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 20:52:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 20:52:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 61FB2812D8C; Fri, 24 Feb 2012 20:52:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anis@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/26] qt commit: Merge pull request #13 from dkormalev/harmattan-test Message-Id: <20120224205211.61FB2812D8C@tyr.zones.apache.org> Date: Fri, 24 Feb 2012 20:52:11 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #13 from dkormalev/harmattan-test Various fixes for harmattan. Scrolling added to qml files 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/fa2dcdc4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/tree/fa2dcdc4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/diff/fa2dcdc4 Branch: refs/heads/master Commit: fa2dcdc4ad4ed32b7e48b18518dde26cdee0142b Parents: aac85d2 a305dd9 Author: Denis Kormalev Authored: Wed Feb 22 07:01:27 2012 -0800 Committer: Denis Kormalev Committed: Wed Feb 22 07:01:27 2012 -0800 ---------------------------------------------------------------------- qml/main.qml | 66 ++++++++++++++++++++++-------------- qml/main_harmattan.qml | 65 ++++++++++++++++++++++-------------- src/plugins/notification.cpp | 21 +++++++++-- src/plugins/notification.h | 3 ++ www/basic.js | 22 +++++++----- www/index.html | 11 ++++-- www/index_qt5.html | 35 +++++++++++++------ 7 files changed, 144 insertions(+), 79 deletions(-) ----------------------------------------------------------------------