chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

trying to load the presentation view outside qml to fix wayland

Browse source
This commit is contained in:
Chris Cochrun 2023-01-13 05:49:35 -06:00
parent 29348d59e7
commit ae27bfdbab
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.cpp
View file

@ -133,7 +133,7 @@ int main(int argc, char *argv[])
//Need to instantiate our slide //Need to instantiate our slide
QScopedPointer<Slide> slide(new Slide); QScopedPointer<Slide> slide(new Slide);
QScopedPointer<File> filemanager(new File); QScopedPointer<File> filemanager(new File);
QQuickView *preswin = new QQuickView; QScopedPointer<QQuickView> preswin(new QQuickView);
preswin->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml"))); preswin->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml")));
// apparently mpv needs this class set // apparently mpv needs this class set
@ -151,7 +151,7 @@ int main(int argc, char *argv[])
qmlRegisterType<ServiceThing>("org.presenter", 1, 0, "ServiceThing"); qmlRegisterType<ServiceThing>("org.presenter", 1, 0, "ServiceThing");
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slide.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slide.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, "FileManager", filemanager.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "FileManager", filemanager.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresentationWindow", preswin); qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", preswin.get());
connectToDatabase(); connectToDatabase();