5befdd4272
- Update to 4.1.3: (4.1.2 has been skipped) - Update fix-build-with-Qt5.6.patch to fix a new compilation problem with Qt 5.6 (kde#399130), the previous one is fixed in this release - Drop fix-build-with-dcraw-0.19.patch, merged upstream OBS-URL: https://build.opensuse.org/request/show/638715 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=83
27 lines
893 B
Diff
27 lines
893 B
Diff
From 90852da0a2ce60fe3ddaff819f2634ed55dbe943 Mon Sep 17 00:00:00 2001
|
|
From: Boudewijn Rempt <boud@valdyas.org>
|
|
Date: Thu, 27 Sep 2018 10:09:47 +0200
|
|
Subject: Fix building with Qt 5.6
|
|
|
|
BUG:399130
|
|
---
|
|
libs/ui/tool/KisToolChangesTracker.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libs/ui/tool/KisToolChangesTracker.cpp b/libs/ui/tool/KisToolChangesTracker.cpp
|
|
index 6f4e30d..b817754 100644
|
|
--- a/libs/ui/tool/KisToolChangesTracker.cpp
|
|
+++ b/libs/ui/tool/KisToolChangesTracker.cpp
|
|
@@ -52,7 +52,7 @@ void KisToolChangesTracker::requestUndo()
|
|
|
|
KisToolChangesTrackerDataSP KisToolChangesTracker::lastState() const
|
|
{
|
|
- return !m_d->undoStack.isEmpty() ? m_d->undoStack.last() : 0;
|
|
+ return !m_d->undoStack.isEmpty() ? m_d->undoStack.last() : static_cast<QSharedPointer<KisToolChangesTrackerData>>(0);
|
|
}
|
|
|
|
void KisToolChangesTracker::reset()
|
|
--
|
|
cgit v0.11.2
|
|
|