mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
cc051064c5
* gnu/packages/qt.scm (grantlee)[source]: Add patch. * gnu/packages/patches/grantlee-register-metaenumvariable.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Iecef53baeb023a80139ac70b9caefcfa7b79a3c6
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
https://patch-diff.githubusercontent.com/raw/steveire/grantlee/pull/91
|
|
also in Debian
|
|
https://sources.debian.org/data/main/g/grantlee5/5.3.1-3/debian/patches/register-comparator.diff
|
|
|
|
From e6a2c1f4f29623f0ced1a946f5ff0c3831ab213b Mon Sep 17 00:00:00 2001
|
|
From: Pino Toscano <toscano.pino@tiscali.it>
|
|
Date: Sat, 12 Aug 2023 12:06:15 +0200
|
|
Subject: [PATCH] Register MetaEnumVariable for comparison
|
|
|
|
This is needed to ensure that MetaEnumVariable can be properly handled
|
|
for comparisons, e.g. as done via QVariant::compare().
|
|
|
|
Followup of commit 3b1931e30a23286a64f713a815f701d194a3c759
|
|
|
|
Fixes #89
|
|
---
|
|
templates/lib/engine.cpp | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/templates/lib/engine.cpp b/templates/lib/engine.cpp
|
|
index c6a6987b..fc6b7797 100644
|
|
--- a/templates/lib/engine.cpp
|
|
+++ b/templates/lib/engine.cpp
|
|
@@ -24,6 +24,9 @@
|
|
#include "exception.h"
|
|
#include "grantlee_config_p.h"
|
|
#include "grantlee_version.h"
|
|
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
+#include "metaenumvariable_p.h"
|
|
+#endif
|
|
#ifdef QT_QML_LIB
|
|
#include "scriptabletags.h"
|
|
#endif
|
|
@@ -32,6 +35,9 @@
|
|
|
|
#include <QtCore/QCoreApplication>
|
|
#include <QtCore/QDir>
|
|
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
+#include <QtCore/QMetaType>
|
|
+#endif
|
|
#include <QtCore/QPluginLoader>
|
|
#include <QtCore/QTextStream>
|
|
|
|
@@ -48,6 +54,10 @@ Engine::Engine(QObject *parent)
|
|
|
|
d_ptr->m_pluginDirs = QCoreApplication::libraryPaths();
|
|
d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH);
|
|
+
|
|
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
+ QMetaType::registerComparators<MetaEnumVariable>();
|
|
+#endif
|
|
}
|
|
|
|
Engine::~Engine()
|