Merge main-dev.qml and main.qml
This commit is contained in:
@ -1,5 +0,0 @@
|
||||
import QtQuick
|
||||
|
||||
LightControlWindow {
|
||||
visible: true
|
||||
}
|
6
main.cpp
6
main.cpp
@ -47,9 +47,11 @@ int main(int argc, char *argv[])
|
||||
|
||||
QQmlApplicationEngine engine;
|
||||
|
||||
engine.rootContext()->setContextProperty("__controller", &controller);
|
||||
|
||||
const QUrl url{windowed ? u"qrc:/lightcontrol/main-dev.qml"_qs : u"qrc:/lightcontrol/main.qml"_qs};
|
||||
engine.rootContext()->setContextProperty("__controller", &controller);
|
||||
engine.rootContext()->setContextProperty("__windowed", windowed);
|
||||
|
||||
const QUrl url{u"qrc:/lightcontrol/main.qml"_qs};
|
||||
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
|
||||
&app, [url](QObject *obj, const QUrl &objUrl) {
|
||||
if (!obj && url == objUrl)
|
||||
|
Reference in New Issue
Block a user