Commit 8f48551d authored by ab0027's avatar ab0027 💬

Update kirigami.patch

parent 94f31423
Pipeline #2213 failed with stages
in 12 minutes and 22 seconds
diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp
index acdefbc..49199fa 100644
--- a/src/kirigamiplugin.cpp
+++ b/src/kirigamiplugin.cpp
@@ -37,7 +37,7 @@ static QString s_selectedStyle;
//Q_INIT_RESOURCE(kirigami);
#ifdef KIRIGAMI_BUILD_TYPE_STATIC
-#include <qrc_kirigami.cpp>
+//#include <qrc_kirigami.cpp>
#endif
class CopyHelperPrivate : public QObject
diff --git a/kirigami.pri b/kirigami.pri
index 922ca53..04b3100 100644
--- a/kirigami.pri
+++ b/kirigami.pri
@@ -27,7 +27,9 @@ HEADERS += $$PWD/src/kirigamiplugin.h \
$$PWD/src/shadowedtexture.h \
$$PWD/src/pagerouter.h \
$$PWD/src/pagepool.h \
- $$PWD/src/avatar.h
+ $$PWD/src/avatar.h \
+ $$PWD/src/imagecolors.h
+
SOURCES += $$PWD/src/kirigamiplugin.cpp \
$$PWD/src/enums.cpp \
$$PWD/src/settings.cpp \
@@ -54,14 +56,16 @@ SOURCES += $$PWD/src/kirigamiplugin.cpp \
$$PWD/src/shadowedtexture.cpp \
$$PWD/src/pagerouter.cpp \
$$PWD/src/pagepool.cpp \
- $$PWD/src/avatar.cpp
+ $$PWD/src/avatar.cpp \
+ $$PWD/src/imagecolors.cpp
INCLUDEPATH += $$PWD/src $$PWD/src/libkirigami
DEFINES += KIRIGAMI_BUILD_TYPE_STATIC
API_VER=1.0
-RESOURCES += $$PWD/kirigami.qrc
+RESOURCES += $$PWD/kirigami.qrc \
+ $$PWD/src/scenegraph/shaders/shaders.qrc
exists($$_PRO_FILE_PWD_/kirigami-icons.qrc) {
message("Using icons QRC file shipped by the project")
diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp
index acdefbc..49199fa 100644
--- a/src/kirigamiplugin.cpp
+++ b/src/kirigamiplugin.cpp
@@ -37,7 +37,7 @@ static QString s_selectedStyle;
//Q_INIT_RESOURCE(kirigami);
#ifdef KIRIGAMI_BUILD_TYPE_STATIC
-#include <qrc_kirigami.cpp>
+//#include <qrc_kirigami.cpp>
#endif
class CopyHelperPrivate : public QObject
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment