@@ -15,7 +15,7 @@
OTHER_FILES += \
diff --git a/src/gba/gba.cpp b/src/gba/gba.cpp
-index d13e71a..64f48be 100644
+index d13e71a..6324df5 100644
--- a/src/gba/gba.cpp
+++ b/src/gba/gba.cpp
@@ -25,7 +25,8 @@
@@ -28,17 +28,19 @@
//#include <qdeclarative.h>
#include <QSemaphore>
-@@ -341,8 +342,11 @@ int main(int argc, char *argv[])
+@@ -341,9 +342,12 @@ int main(int argc, char *argv[])
qmlRegisterType<GbaCheats>();
qmlRegisterType<GbaGameSharkValidator>("EmuMaster", 1, 0,
"GbaGameSharkValidator");
- QApplication app(argc, argv);
- EmuView view(&gbaEmu, argv[1]);
+- return app.exec();
+
+ QGuiApplication *app = new QGuiApplication(argc, argv);
+ QQuickView *view = new QQuickView();
+
+ EmuView emuView(&gbaEmu, argv[1], view);
- return app.exec();
++ return app->exec();
}
+ void GbaEmu::sl()
|