Merge branch 'experimental/qml-edit' into experimental/add-tree-children

# Conflicts: # src/application/xqchildmodel.cpp
2025-09-12 17:21:35 +02:00
parent d07ef3fbf9 fd94b2d354
commit 32c5121fcd
7 changed files with 55 additions and 74 deletions
--- a/src/application/xqmainwindow.cpp
+++ b/src/application/xqmainwindow.cpp
@@ -112,7 +112,7 @@ void XQMainWindow::initMainWindow()

    // #2. load demo data
    loadDocument( c_DocumentFileName1 );
-    //loadDocumentQML( c_DocumentFileName2 );
+    loadDocumentQML( c_DocumentFileName2 );
    //loadDocument( c_DocumentFileName2 );
    //loadDocument( c_DocumentFileName3 );