You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/02/24 21:52:11 UTC

[14/26] qt commit: Merge pull request #8 from dkormalev/qt4-qml

Merge pull request #8 from dkormalev/qt4-qml

Qt4 version moved to qml webview. Harmattan support added

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/ac508041
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/tree/ac508041
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/diff/ac508041

Branch: refs/heads/master
Commit: ac508041ea0e46bc5bcf46fc349edc58bbc80d11
Parents: ff477a0 938fe5c
Author: Denis Kormalev <ko...@gmail.com>
Authored: Fri Feb 17 13:21:44 2012 -0800
Committer: Denis Kormalev <ko...@gmail.com>
Committed: Fri Feb 17 13:21:44 2012 -0800

----------------------------------------------------------------------
 cordovaqt.pro          |   19 ++++--
 main.cpp               |   23 +++++--
 mainwindow.cpp         |  134 -------------------------------------------
 mainwindow.h           |   55 ------------------
 mainwindow.ui          |   43 --------------
 qml/cordova_wrapper.js |   13 ++++
 qml/main.qml           |   40 +++++++-------
 qml/main_harmattan.qml |   53 +++++++++++++++++
 qml/main_qt5.qml       |   39 +++++++++++++
 src/cordova.cpp        |   16 +++++-
 src/cordova.h          |    1 +
 www/basic.js           |   10 ++--
 www/index.html         |    2 +-
 www/js/cordova.qt.js   |   13 +----
 www/js/file.js         |    2 +-
 15 files changed, 176 insertions(+), 287 deletions(-)
----------------------------------------------------------------------