[3.18] backports/uranium: fix SimpleButton bug #358
2 changed files with 38 additions and 2 deletions
|
@ -0,0 +1,33 @@
|
|||
From 88fd460a63263d66173f1e0127b0f208577d7f4e Mon Sep 17 00:00:00 2001
|
||||
From: fieldOfView <aldo@fieldofview.com>
|
||||
Date: Sat, 20 May 2023 21:14:36 +0200
|
||||
Subject: [PATCH] Fix SimpleButton use of UM.ColorImage
|
||||
|
||||
Fixes https://github.com/Ultimaker/Cura/issues/15524
|
||||
---
|
||||
UM/Qt/qml/UM/SimpleButton.qml | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/UM/Qt/qml/UM/SimpleButton.qml b/UM/Qt/qml/UM/SimpleButton.qml
|
||||
index d3d398753c..d3bd0e8e14 100644
|
||||
--- a/UM/Qt/qml/UM/SimpleButton.qml
|
||||
+++ b/UM/Qt/qml/UM/SimpleButton.qml
|
||||
@@ -1,7 +1,8 @@
|
||||
-// Copyright (c) 2018 Ultimaker B.V.
|
||||
+// Copyright (c) 2023 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.1
|
||||
+import UM 1.5 as UM
|
||||
|
||||
MouseArea
|
||||
{
|
||||
@@ -27,7 +28,7 @@ MouseArea
|
||||
radius: 0
|
||||
}
|
||||
|
||||
- ColorImage
|
||||
+ UM.ColorImage
|
||||
{
|
||||
id: image
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
# Maintainer: Anjandev Momi <anjan@momi.ca>
|
||||
pkgname=uranium
|
||||
pkgver=5.2.2
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A Python framework for building Desktop applications"
|
||||
url="https://github.com/Ultimaker/Uranium"
|
||||
arch="noarch !armhf !riscv64" # armhf: no py3-qt5, rv64: no py3-shapely
|
||||
|
@ -20,7 +20,9 @@ checkdepends="py3-pytest py3-pytest-benchmark py3-twisted"
|
|||
options="!check" # checks broken from 5.x onward
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/Uranium/archive/refs/tags/$pkgver.tar.gz
|
||||
cmake.patch
|
||||
cmake-helpers.patch"
|
||||
cmake-helpers.patch
|
||||
874_fix-simplebutton-use-of-um-colorimage.patch
|
||||
"
|
||||
builddir="$srcdir/Uranium-$pkgver"
|
||||
|
||||
build() {
|
||||
|
@ -52,4 +54,5 @@ sha512sums="
|
|||
a9c222400022e05b5c42c72843b024204a58f5d233805bdffa610a2d9cbd1873773868b049aabbe52c6e859f235ca5428fcdfdbb86651f428483999060611e10 uranium-5.2.2.tar.gz
|
||||
196a04164de288f5bffeebb73ace9390059dcffebaf40395368f413d1af2e2c668d85dd4c761ad226732540d41598235c2c368152cc157d2e89445ce27738c9b cmake.patch
|
||||
aa185ce3592036f045e3386266015cc08443c2e4f9b9a4c03c77c13525af98d68eaa3360e8858e0561417a826c73bf8a2b209bcad91d2cc16cce32fb0231fcf8 cmake-helpers.patch
|
||||
d0957ec427070f1b8ebe9257447402e09e3af7a89fe9b3c5967a4c40bfc753fab0ea8f0b0c49e17f5895abcd69888b59e4735d130cb47280207af1b8dbec1e71 874_fix-simplebutton-use-of-um-colorimage.patch
|
||||
"
|
||||
|
|
Loading…
Reference in a new issue