Commit a3c931ed authored by ab0027's avatar ab0027 💬

Kirigami Patch

parent c7d72450
Pipeline #2210 failed with stages
in 32 minutes and 12 seconds
......@@ -59,12 +59,15 @@ COMMIT_ID=$(cd $BUILDDIR && git rev-parse --short HEAD)
git clone https://invent.kde.org/maui/mauikit.git --depth 1
git clone https://invent.kde.org/frameworks/kirigami.git --depth 1
cd kirigami
git apply ../../kirigami-qrc.patch
)
mkdir build
cd build
/Qt/5.13.2/android_armv7/bin/qmake ANDROID_ABIS="armeabi-v7a" CONFIG+=qtquickcompiler -spec android-clang ../*.pro
$SCRIPTPATH/Android/ndk/19.2.5345600/prebuilt/linux-x86_64/bin/make -j8 install INSTALL_ROOT=android-build
$SCRIPTPATH/Android/ndk/19.2.5345600/prebuilt/linux-x86_64/bin/make -j$(nproc) install INSTALL_ROOT=android-build
[ -d ../android_files ] && cp -r ../android_files/* ./android-build/
/Qt/5.13.2/android_armv7/bin/androiddeployqt --verbose --input $PWD/*.json --output $PWD/android-build --android-platform android-29 --gradle | tee $PROJECT_NAME.log 2>&1
mv $PWD/android-build/build/outputs/apk/debug/*.apk ../../${PROJECT_NAME}-${BUILD_TYPE}-${APP_VERSION}-git+${COMMIT_ID}-armv7-debug.deb
......
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