Fix tests and bump CxxWrap compat

JuliaGraphics · Jun 17, 2024 · d8095f6 · d8095f6
1 parent e8ebdd9
commit d8095f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -15,7 +15,7 @@ jlqml_jll = "6b5019fb-a83d-5b4e-a9f7-678a36c28df7"
 
 [compat]
 ColorTypes = "0.11"
-CxxWrap = "0.15.1"
+CxxWrap = "0.16"
 MacroTools = "0.5"
 Observables = "0.5"
 Requires = "1.0"

diff --git a/src/QML.jl b/src/QML.jl
@@ -73,7 +73,6 @@ end
 end
 
 function load_qml(qmlfilename, engine)
-  ctx = root_context(CxxRef(engine))
   if !load_into_engine(engine, QString(qmlfilename))
     error("Failed to load QML file ", qmlfilename)
   end
@@ -96,8 +95,8 @@ function loadqml(qmlfilename; kwargs...)
   try
     return load_qml(qmlfilename, qml_engine)
   catch
-    cleanup()
     QML.process_events()
+    cleanup()
     rethrow()
   end
 end

diff --git a/test/qml/tableview.qml b/test/qml/tableview.qml
@@ -118,7 +118,7 @@ ApplicationWindow {
     Item {
 
       Layout.alignment: Qt.AlignCenter
-      Layout.preferredWidth: 100
+      Layout.preferredWidth: 300
       Layout.preferredHeight: 200
 
       HorizontalHeaderView {