projects
/
lichviet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop'
[lichviet]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index
4e3c667
..
8ab3a75
100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-21,7
+21,8
@@
along with this program. If not, see <http://www.gnu.org/licenses/>
#include <QtDeclarative/QDeclarativeContext>
#include "qmlapplicationviewer.h"
#include <QtDeclarative/QDeclarativeContext>
#include "qmlapplicationviewer.h"
-#include "lunarcalendar.h"
+
+#include "controller.h"
#ifdef Q_WS_MAEMO_5
#include <QtOpenGL/QGLWidget>
#ifdef Q_WS_MAEMO_5
#include <QtOpenGL/QGLWidget>
@@
-34,13
+35,12
@@
int main(int argc, char *argv[])
app.setApplicationVersion(APP_VERSION);
app.setApplicationVersion(APP_VERSION);
- LunarCalendar lc;
+ Controller ctrller;
viewer.rootContext()->setContextProperty("ROOT", &viewer);
viewer.rootContext()->setContextProperty("ROOT", &viewer);
- viewer.rootContext()->setContextProperty("LC", &lc);
+ viewer.rootContext()->setContextProperty("Controller", &ctrller);
viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- //viewer.setMainQmlFile(QLatin1String("qml/LichViet/main.qml"));
viewer.setSource(QUrl("qrc:/qml/LichViet/main.qml"));
viewer.setWindowTitle(QString::fromUtf8("Lịch Việt"));
viewer.setSource(QUrl("qrc:/qml/LichViet/main.qml"));
viewer.setWindowTitle(QString::fromUtf8("Lịch Việt"));