Code Review
/
apps
/
mediaplayer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
mediaplayer: qml: fix clear() being called on wrong object
[apps/mediaplayer.git]
/
app
/
main.cpp
diff --git
a/app/main.cpp
b/app/main.cpp
index
145d9d1
..
8fa8117
100644
(file)
--- a/
app/main.cpp
+++ b/
app/main.cpp
@@
-28,6
+28,8
@@
#include <QQuickWindow>
#include <libhomescreen.hpp>
#include <qlibwindowmanager.h>
#include <QQuickWindow>
#include <libhomescreen.hpp>
#include <qlibwindowmanager.h>
+#include <bluetooth.h>
+#include <mediaplayer.h>
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
@@
-94,6
+96,8
@@
int main(int argc, char *argv[])
}
});
}
});
+ context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress));
+ context->setContextProperty("bluetooth_connection", new Bluetooth(bindingAddress));
engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
QObject *root = engine.rootObjects().first();
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
QObject *root = engine.rootObjects().first();
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);