Robert Schütz 2024-02-13 12:02:44 -08:00
parent 4ee752288b
commit 51d752cdaf
2 changed files with 2 additions and 30 deletions

View file

@ -1,26 +0,0 @@
From b26a91fd0f70e8f0a8f3360a5f371a1eace70002 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 16 Apr 2023 22:10:55 +0800
Subject: [PATCH] fix build with qt 6.5
The fix is borrowed from https://github.com/hluk/CopyQ/pull/2324
---
src/scripting/Script.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/scripting/Script.cpp b/src/scripting/Script.cpp
index 3437f125..906eefde 100644
--- a/src/scripting/Script.cpp
+++ b/src/scripting/Script.cpp
@@ -352,7 +352,7 @@ Script::MethodResult Script::doCallMethod(QObject * obj, const QString& name,
}
else if (typeName == QString::fromLatin1("QVariant")) {
// QMetaType can't construct QVariant objects
- retValArg = Q_RETURN_ARG(QVariant, result);
+ retValArg = QGenericReturnArgument("QVariant", static_cast<void*>(result.data()));
}
else {
// Note: These two lines are a hack!
--
2.39.2

View file

@ -14,17 +14,15 @@
stdenv.mkDerivation rec {
pname = "texworks";
version = "0.6.8";
version = "0.6.9";
src = fetchFromGitHub {
owner = "TeXworks";
repo = "texworks";
rev = "release-${version}";
sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ=";
sha256 = "sha256-G8TVTVQPELyE6H9a6gWSyWHi653TWzUoaRdlfPnngM0=";
};
patches = [ ./0001-fix-build-with-qt-6.5.patch ];
nativeBuildInputs = [
cmake
pkg-config