Test v0.5.3

.github/workflows/test.yml

@@ -15,8 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.7'
           - '1.8'
+          - '1.9'
           - 'nightly'
         os:
           - ubuntu-latest

CMakeLists.txt

@@ -2,7 +2,7 @@ project(JlQML)
 
 cmake_minimum_required(VERSION 3.16.0)
 
-set(JlQML_VERSION 0.5.2)
+set(JlQML_VERSION 0.5.3)
 message(STATUS "Project version: v${JlQML_VERSION}")
 
 set(CMAKE_MACOSX_RPATH 1)
@@ -49,6 +49,8 @@ qt6_add_qml_module(jlqml
   SOURCES
     application_manager.hpp
     application_manager.cpp
+    foreign_thread_manager.hpp
+    foreign_thread_manager.cpp
     julia_api.hpp
     julia_api.cpp
     julia_canvas.hpp

application_manager.cpp

@@ -1,6 +1,8 @@
-#include "application_manager.hpp"
 #include "jlcxx/functions.hpp"
 
+#include "foreign_thread_manager.hpp"
+#include "application_manager.hpp"
+
 namespace qmlwrap
 {
 
@@ -11,11 +13,9 @@ void julia_message_output(QtMsgType type, const QMessageLogContext &context, con
   case QtDebugMsg:
     jl_safe_printf("Qt Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
     break;
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
   case QtInfoMsg:
     jl_safe_printf("Qt Info: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
     break;
-#endif
   case QtWarningMsg:
     jl_safe_printf("Qt Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
     break;
@@ -96,6 +96,7 @@ void ApplicationManager::exec()
     stoptimer();
     app->exit(status);
   });
+  ForeignThreadManager::instance().clear(QThread::currentThread());
   const int status = app->exec();
   if (status != 0)
   {
@@ -112,6 +113,7 @@ ApplicationManager::ApplicationManager()
 
   QSurfaceFormat format = QSurfaceFormat::defaultFormat();
   format.setProfile(QSurfaceFormat::CoreProfile);
+  format.setRenderableType(QSurfaceFormat::OpenGL);
   format.setMajorVersion(3);
   format.setMinorVersion(3);
   //format.setOption(QSurfaceFormat::DebugContext); // note: this needs OpenGL 4.3

foreign_thread_manager.cpp

@@ -0,0 +1,39 @@
+#include "jlcxx/jlcxx.hpp"
+
+#include "foreign_thread_manager.hpp"
+
+ForeignThreadManager& ForeignThreadManager::instance()
+{
+  static ForeignThreadManager instance;
+  return instance;
+}
+
+void ForeignThreadManager::add_thread(QThread *t)
+{
+  m_mutex.lock();
+  if(!m_threads.contains(t))
+  {
+    m_threads.insert(t);
+  #if (JULIA_VERSION_MAJOR * 100 + JULIA_VERSION_MINOR) >= 109
+    jl_adopt_thread();
+  #else
+    if(m_threads.size() > 1)
+    {
+      std::cout << "Warning: using multiple threads in Julia versions older than 1.9 will probably crash" << std::endl;
+    }
+  #endif
+  }
+  m_mutex.unlock();
+}
+
+void ForeignThreadManager::clear(QThread* main_thread)
+{
+  m_mutex.lock();
+  m_threads.clear();
+  m_threads.insert(main_thread);
+  m_mutex.unlock();
+}
+
+ForeignThreadManager::ForeignThreadManager()
+{
+}

foreign_thread_manager.hpp

@@ -0,0 +1,17 @@
+#include <QSet>
+#include <QMutex>
+#include <QThread>
+
+class ForeignThreadManager
+{
+public:
+  static ForeignThreadManager& instance();
+
+  void add_thread(QThread* t);
+  void clear(QThread* main_thread);
+
+private:
+  ForeignThreadManager();
+  QSet<QThread*> m_threads;
+  QMutex m_mutex;
+};

julia_canvas.cpp

@@ -2,7 +2,10 @@
 #include <QPainter>
 #include <QQuickWindow>
 
+#include "foreign_thread_manager.hpp"
+
 #include "julia_canvas.hpp"
+
 namespace qmlwrap
 {
 
@@ -12,6 +15,7 @@ JuliaCanvas::JuliaCanvas(QQuickItem *parent) : QQuickPaintedItem(parent)
 
 void JuliaCanvas::paint(QPainter *painter)
 {
+  ForeignThreadManager::instance().add_thread(QThread::currentThread());
   // allocate buffer for julia callback to draw on
   int iwidth = width();
   int iheight = height();

opengl_viewport.cpp

@@ -64,11 +64,7 @@ OpenGLViewport::OpenGLViewport(QQuickItem *parent, RenderFunction* render_func)
     qFatal("QSG_RENDER_LOOP must be set to basic to use OpenGLViewport or MakieViewport. Add the line\nENV[\"QSG_RENDER_LOOP\"] = \"basic\"\nat the top of your Julia program");
   }
   QObject::connect(this, &OpenGLViewport::renderFunctionChanged, this, &OpenGLViewport::update);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   setMirrorVertically(true);
-#else
-  qWarning() << "setMirrorVertically not available before Qt 5.6, OpenGLViewport image will be upside-down";
-#endif
 }
 
 void OpenGLViewport::render()

test/setup-test.jl

@@ -24,18 +24,6 @@ function libcxxwrap_jll_version()
   return VersionNumber(baseversion)
 end
 
-@static if Sys.isapple()
-  jllversion = libcxxwrap_jll_version()
-  cd(joinpath(cxxwrap_root, "lib")) do
-    expected_dylib = "libcxxwrap_julia.$jllversion.dylib"
-    if !isfile(expected_dylib)
-      compiled_dylib = readlink("libcxxwrap_julia.dylib")
-      symlink(compiled_dylib, expected_dylib)
-      println("linked $expected_dylib to $compiled_dylib")
-    end
-  end
-end
-
 envdir = mktempdir()
 import Pkg
 Pkg.activate(envdir)

wrap_qml.cpp

@@ -479,11 +479,7 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& qml_module)
 
   qml_module.method("effectiveDevicePixelRatio", [] (QQuickWindow& w)
   {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
-      return w.effectiveDevicePixelRatio();
-#else
-      return 1.0;
-#endif
+    return w.effectiveDevicePixelRatio();
   });
 
   qml_module.add_type<QQuickView>("QQuickView", julia_base_type<QQuickWindow>())
@@ -513,7 +509,11 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& qml_module)
     }
   });
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+  qml_module.method("qputenv", [] (const char* varName, QByteArray value) { qputenv(varName, value); });
+#else
   qml_module.method("qputenv", qputenv);
+#endif
   qml_module.method("qgetenv", qgetenv);
   qml_module.method("qunsetenv", qunsetenv);