Skip to content

Commit 893348e

Browse files
johnny9D33r-Gee
authored andcommitted
qml: fix file location path in Controls plugin for Android
1 parent b6bf91f commit 893348e

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $(package)_patches += fast_fixed_dtoa_no_optimize.patch
2424
$(package)_patches += guix_cross_lib_path.patch
2525
$(package)_patches += fix_android_plugin_names.patch
2626
$(package)_patches += fix_riscv_atomic.patch
27+
$(package)_patches += fix_android_controls_file_location.patch
2728

2829
$(package)_qtdeclarative_file_name = qtdeclarative-$($(package)_suffix)
2930
$(package)_qtdeclarative_sha256_hash = 5cc169d91efb15a1ee7f484862f872c3eaba592dacf3c0fbcb55c0f3c208254a
@@ -300,6 +301,7 @@ define $(package)_preprocess_cmds
300301
patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
301302
patch -p1 -i $($(package)_patch_dir)/fix_android_plugin_names.patch && \
302303
patch -p1 -i $($(package)_patch_dir)/fix_riscv_atomic.patch && \
304+
patch -p1 -i $($(package)_patch_dir)/fix_android_controls_file_location.patch && \
303305
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
304306
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
305307
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/qtquickcontrols/src/controls/plugin.cpp b/src/controls/plugin.cpp
2+
index 446357aa..a08957cd 100644
3+
--- a/qtquickcontrols/src/controls/plugin.cpp
4+
+++ b/qtquickcontrols/src/controls/plugin.cpp
5+
@@ -240,7 +240,7 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur
6+
QString QtQuickControls1Plugin::fileLocation() const
7+
{
8+
#ifdef Q_OS_ANDROID
9+
- return "qrc:/android_rcc_bundle/qml/QtQuick/Controls";
10+
+ return "qrc:/qt-project.org/imports/QtQuick/Controls";
11+
#else
12+
#ifndef QT_STATIC
13+
if (isLoadedFromResource())

0 commit comments

Comments
 (0)