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

[18/26] qt commit: Merge pull request #6 from dkormalev/qt5-quick

Merge pull request #6 from dkormalev/qt5-quick

Qt5 quick

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

Branch: refs/heads/master
Commit: a50a7e257ccd7f97358acd88e0b989d9a43cef84
Parents: f889362 343a2c7
Author: Jeff Tranter <jt...@ics.com>
Authored: Fri Feb 17 06:01:15 2012 -0800
Committer: Jeff Tranter <jt...@ics.com>
Committed: Fri Feb 17 06:01:15 2012 -0800

----------------------------------------------------------------------
 cordovaqt.pro               |   56 ++++++++++++++++++------------------
 main.cpp                    |   18 +++++++++++-
 mainwindow.cpp              |   36 +++++++++++++++++++++++-
 mainwindow.h                |    8 ++++-
 qml/cordova_wrapper.js      |   29 +++++++++++++++++++
 qml/main.qml                |   39 ++++++++++++++++++++++++++
 src/cordova.cpp             |   55 ++++++++++++++++++++----------------
 src/cordova.h               |   24 ++++++++++++++--
 src/cplugin.cpp             |   12 +------
 src/cplugin.h               |    4 --
 src/plugins/compass.h       |    3 ++
 src/plugins/geolocation.cpp |    2 +-
 www/index_qt5.html          |   36 ++++++++++++++++++++++++
 www/js/cordova.qt5.js       |   57 ++++++++++++++++++++++++++++++++++++++
 14 files changed, 304 insertions(+), 75 deletions(-)
----------------------------------------------------------------------