Code Review
/
apps
/
mixer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove windowmanager deps
[apps/mixer.git]
/
app
/
main.cpp
diff --git
a/app/main.cpp
b/app/main.cpp
index
4921bf2
..
41b5892
100644
(file)
--- a/
app/main.cpp
+++ b/
app/main.cpp
@@
-16,9
+16,10
@@
* limitations under the License.
*/
* limitations under the License.
*/
-
+#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
+#include <QtQml/QQmlContext>
#include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlApplicationEngine>
-#include <QtAGLExtras/AGLApplication>
#include <QtQml/qqml.h>
#include "mixer.hpp"
#include <QtQml/qqml.h>
#include "mixer.hpp"
@@
-26,12
+27,12
@@
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- AGLApplication app(argc, argv);
- app.setApplicationName("Mixer");
- app.setupApplicationRole("mixer");
+ QGuiApplication app(argc, argv);
+ app.setDesktopFileName("mixer");
+ QQmlApplicationEngine engine;
qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
-
app
.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+
engine
.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
return app.exec();
}
return app.exec();
}