Workaround https://bugreports.qt.io/browse/QTBUG-117153

albertlauncher · Oct 3, 2023 · 5da3566 · 5da3566
1 parent 734971c
commit 5da3566
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/python/src/pypluginloader.cpp b/python/src/pypluginloader.cpp
@@ -217,17 +217,12 @@ QString PyPluginLoader::load()
             module_.attr("md_id") = metadata_.id;
 
         // Attach logcat functions
-#if QT_VERSION != 0x060502
-        py::setattr(module_,"debug", py::cpp_function([this](const QString &s){ qCDebug(logging_category_factory) << s; }));
-        py::setattr(module_,"info", py::cpp_function([this](const QString &s){ qCInfo(logging_category_factory) << s; }));
-        py::setattr(module_,"warning", py::cpp_function([this](const QString &s){ qCWarning(logging_category_factory) << s; }));
-        py::setattr(module_,"critical", py::cpp_function([this](const QString &s){ qCCritical(logging_category_factory) << s; }));
-#else
-        py::setattr(module_,"debug", py::cpp_function([this](const QString &s){ qCDebug(*logging_category) << s; }));
-        py::setattr(module_,"info", py::cpp_function([this](const QString &s){ qCInfo(*logging_category) << s; }));
-        py::setattr(module_,"warning", py::cpp_function([this](const QString &s){ qCWarning(*logging_category) << s; }));
-        py::setattr(module_,"critical", py::cpp_function([this](const QString &s){ qCCritical(*logging_category) << s; }));
-#endif
+        // https://bugreports.qt.io/browse/QTBUG-117153
+        // https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?h=6.5&id=2823763072ce3a2da0210dbc014c6ad3195fbeff
+        py::setattr(module_,"debug", py::cpp_function([this](const QString &s){ qCDebug((*logging_category)) << s; }));
+        py::setattr(module_,"info", py::cpp_function([this](const QString &s){ qCInfo((*logging_category)) << s; }));
+        py::setattr(module_,"warning", py::cpp_function([this](const QString &s){ qCWarning((*logging_category)) << s; }));
+        py::setattr(module_,"critical", py::cpp_function([this](const QString &s){ qCCritical((*logging_category)) << s; }));
 
         // Execute module
         pyspec.attr("loader").attr("exec_module")(module_);