diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index dd30a60559..2afa47fece 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -24,6 +24,7 @@ $(package)_patches += fast_fixed_dtoa_no_optimize.patch $(package)_patches += guix_cross_lib_path.patch $(package)_patches += fix_android_plugin_names.patch $(package)_patches += fix_riscv_atomic.patch +$(package)_patches += fix_android_controls_file_location.patch $(package)_qtdeclarative_file_name = qtdeclarative-$($(package)_suffix) $(package)_qtdeclarative_sha256_hash = 5cc169d91efb15a1ee7f484862f872c3eaba592dacf3c0fbcb55c0f3c208254a @@ -300,6 +301,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_android_plugin_names.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_riscv_atomic.patch && \ + patch -p1 -i $($(package)_patch_dir)/fix_android_controls_file_location.patch && \ mkdir -p qtbase/mkspecs/macx-clang-linux &&\ cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ diff --git a/depends/patches/qt/fix_android_controls_file_location.patch b/depends/patches/qt/fix_android_controls_file_location.patch new file mode 100644 index 0000000000..70663aa3c6 --- /dev/null +++ b/depends/patches/qt/fix_android_controls_file_location.patch @@ -0,0 +1,13 @@ +diff --git a/qtquickcontrols/src/controls/plugin.cpp b/src/controls/plugin.cpp +index 446357aa..a08957cd 100644 +--- a/qtquickcontrols/src/controls/plugin.cpp ++++ b/qtquickcontrols/src/controls/plugin.cpp +@@ -240,7 +240,7 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur + QString QtQuickControls1Plugin::fileLocation() const + { + #ifdef Q_OS_ANDROID +- return "qrc:/android_rcc_bundle/qml/QtQuick/Controls"; ++ return "qrc:/qt-project.org/imports/QtQuick/Controls"; + #else + # ifndef QT_STATIC + if (isLoadedFromResource())