qt6,pyqt6: include NFC submodule

accumulator · Jun 18, 2024 · 829b8af · 829b8af
1 parent 5df11be
commit 829b8af
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/pythonforandroid/bootstraps/qt6/build/templates/arrays.tmpl.xml b/pythonforandroid/bootstraps/qt6/build/templates/arrays.tmpl.xml
@@ -57,5 +57,6 @@
 <!--         <item>{{ arch }};Qt6Xml_{{ arch }}</item> -->
         <item>{{ arch }};Qt6Multimedia_{{ arch }}</item>
         <item>{{ arch }};Qt6MultimediaQuick_{{ arch }}</item>
+        <item>{{ arch }};Qt6Nfc_{{ arch }}</item>
     </string-array>
 </resources>
diff --git a/pythonforandroid/recipes/hostqt6/__init__.py b/pythonforandroid/recipes/hostqt6/__init__.py
@@ -73,7 +73,7 @@ def build_arch(self, arch):
             configure = configure.bake('-nomake', 'examples')
             configure = configure.bake('-make', 'tools')
             configure = configure.bake('-submodules', ','.join(
-                ['qtbase', 'qttools', 'qtmultimedia', 'qtquick3d']))
+                ['qtbase', 'qttools', 'qtmultimedia', 'qtquick3d', 'qtconnectivity']))
             configure = configure.bake('-skip', ','.join(
                 ['qtactiveqt']))
 

diff --git a/pythonforandroid/recipes/pyqt6/__init__.py b/pythonforandroid/recipes/pyqt6/__init__.py
@@ -16,7 +16,7 @@ class PyQt6Recipe(Recipe):
 
     depends = ['qt6', 'pyjnius', 'setuptools', 'pyqt6sip', 'hostpython3', 'pyqt_builder']
 
-    BINDINGS = ['QtCore', 'QtNetwork', 'QtGui', 'QtQml', 'QtQuick', 'QtMultimedia']
+    BINDINGS = ['QtCore', 'QtNetwork', 'QtGui', 'QtQml', 'QtQuick', 'QtMultimedia', 'QtNfc']
 
     def get_recipe_env(self, arch):
         env = super().get_recipe_env(arch)

diff --git a/pythonforandroid/recipes/qt6/__init__.py b/pythonforandroid/recipes/qt6/__init__.py
@@ -48,6 +48,7 @@ def get_libraries(self, arch_name, in_context=False):
             f'libQt6ShaderTools_{arch_name}.so': 'qtbase/lib',
             f'libQt6Svg_{arch_name}.so': 'qtbase/lib',
             # f'libQt6Xml_{arch_name}.so': 'qtbase/lib',
+            f'libQt6Nfc_{arch_name}.so': 'qtbase/lib',
 
             f'libplugins_platforms_qtforandroid_{arch_name}.so': 'qtbase/plugins/platforms',
             f'libplugins_imageformats_qjpeg_{arch_name}.so': 'qtbase/plugins/imageformats',
@@ -145,7 +146,7 @@ def build_arch(self, arch):
             configure = configure.bake('-nomake', 'examples')
             configure = configure.bake('-no-widgets')
             configure = configure.bake('-submodules', ','.join(
-                ['qtbase', 'qtdeclarative', 'qtimageformats', 'qtmultimedia']))
+                ['qtbase', 'qtdeclarative', 'qtimageformats', 'qtmultimedia', 'qtconnectivity']))
             configure = configure.bake('-skip', ','.join(
                 # ['qtquick3d', 'qtquick3dphysics', 'qtactiveqt']))
                 ['qtactiveqt']))