Krita: bump version

This commit is contained in:
Gerasim Troeglazov
2019-12-10 21:04:30 +10:00
parent 7754bc515a
commit e902c2421c
2 changed files with 9 additions and 24 deletions

View File

@@ -1,11 +1,11 @@
From a9f8a63397cacc3f5ad0da2eca30e24c095e13d6 Mon Sep 17 00:00:00 2001
From 17a83bd99486aa74a0890a03ef00c4e18a05d983 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 14 Oct 2019 00:06:41 +1000
Date: Tue, 10 Dec 2019 20:04:06 +1000
Subject: Fix haiku build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eeb998..8a22768 100644
index 2fb785a..87bc2be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -399,7 +399,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
@@ -18,7 +18,7 @@ index 6eeb998..8a22768 100644
find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras)
diff --git a/krita/main.cc b/krita/main.cc
index 5077343..fb0a157 100644
index 34898c3..bfa734b 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -73,6 +73,12 @@
@@ -53,7 +53,7 @@ index 5077343..fb0a157 100644
#else
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share"));
#endif
@@ -538,6 +547,8 @@ extern "C" int main(int argc, char **argv)
@@ -543,6 +552,8 @@ extern "C" int main(int argc, char **argv)
if (logUsage) {
KisUsageLogger::close();
}
@@ -170,21 +170,6 @@ index ab83086..e40c143 100644
#else
return qApp->applicationDirPath() + "/../";
#endif
diff --git a/libs/widgetutils/kis_icon_utils.cpp b/libs/widgetutils/kis_icon_utils.cpp
index 408174f..7be9ee8 100644
--- a/libs/widgetutils/kis_icon_utils.cpp
+++ b/libs/widgetutils/kis_icon_utils.cpp
@@ -29,8 +29,10 @@
#include <KoIcon.h>
#if QT_VERSION >= 0x050900
+#if !defined(Q_OS_HAIKU)
#define CACHE_ICONS
#endif
+#endif
namespace KisIconUtils
{
diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt
index 6952b67..58ecaae 100644
--- a/plugins/dockers/CMakeLists.txt
@@ -199,5 +184,5 @@ index 6952b67..58ecaae 100644
endif()
add_subdirectory(overview)
--
2.23.0
2.24.0