780e338014
- Update to 4.1.5: (4.1.4 has been skipped) * See https://krita.org/en/item/krita-4-1-5-released/ - Update fix-build-with-Qt5.6.patch yet again to fix a new compilation error with Qt 5.6 (kde#399677), the previous one is fixed in this release OBS-URL: https://build.opensuse.org/request/show/641665 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=85
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From ff3194528deea13562422cad0d0ad83248fd63d2 Mon Sep 17 00:00:00 2001
|
|
From: Boudewijn Rempt <boud@valdyas.org>
|
|
Date: Fri, 12 Oct 2018 12:33:37 +0200
|
|
Subject: Fix build with Qt 5.6
|
|
|
|
BUG:399677
|
|
---
|
|
libs/flake/text/KoSvgTextChunkShape.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libs/flake/text/KoSvgTextChunkShape.cpp b/libs/flake/text/KoSvgTextChunkShape.cpp
|
|
index 86c7747..ea8e521 100644
|
|
--- a/libs/flake/text/KoSvgTextChunkShape.cpp
|
|
+++ b/libs/flake/text/KoSvgTextChunkShape.cpp
|
|
@@ -701,7 +701,7 @@ Result hasPreviousSibling(KoXmlNode node)
|
|
return hasPreviousSibling(node) == FoundNothing ? FoundNothing : FoundSpace;
|
|
}
|
|
|
|
- return text[text.size() - 1] != " " ? FoundText : FoundSpace;
|
|
+ return text[text.size() - 1] != ' ' ? FoundText : FoundSpace;
|
|
}
|
|
}
|
|
}
|
|
@@ -732,7 +732,7 @@ Result hasNextSibling(KoXmlNode node)
|
|
}
|
|
|
|
if (!text.isEmpty()) {
|
|
- return text[0] != " " ? FoundText : FoundSpace;
|
|
+ return text[0] != ' ' ? FoundText : FoundSpace;
|
|
}
|
|
}
|
|
}
|
|
--
|
|
cgit v0.11.2
|
|
|