Skip to content

Commit 829b8af

Browse files
committed
qt6,pyqt6: include NFC submodule
1 parent 5df11be commit 829b8af

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

pythonforandroid/bootstraps/qt6/build/templates/arrays.tmpl.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@
5757
<!-- <item>{{ arch }};Qt6Xml_{{ arch }}</item> -->
5858
<item>{{ arch }};Qt6Multimedia_{{ arch }}</item>
5959
<item>{{ arch }};Qt6MultimediaQuick_{{ arch }}</item>
60+
<item>{{ arch }};Qt6Nfc_{{ arch }}</item>
6061
</string-array>
6162
</resources>

pythonforandroid/recipes/hostqt6/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def build_arch(self, arch):
7373
configure = configure.bake('-nomake', 'examples')
7474
configure = configure.bake('-make', 'tools')
7575
configure = configure.bake('-submodules', ','.join(
76-
['qtbase', 'qttools', 'qtmultimedia', 'qtquick3d']))
76+
['qtbase', 'qttools', 'qtmultimedia', 'qtquick3d', 'qtconnectivity']))
7777
configure = configure.bake('-skip', ','.join(
7878
['qtactiveqt']))
7979

pythonforandroid/recipes/pyqt6/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class PyQt6Recipe(Recipe):
1616

1717
depends = ['qt6', 'pyjnius', 'setuptools', 'pyqt6sip', 'hostpython3', 'pyqt_builder']
1818

19-
BINDINGS = ['QtCore', 'QtNetwork', 'QtGui', 'QtQml', 'QtQuick', 'QtMultimedia']
19+
BINDINGS = ['QtCore', 'QtNetwork', 'QtGui', 'QtQml', 'QtQuick', 'QtMultimedia', 'QtNfc']
2020

2121
def get_recipe_env(self, arch):
2222
env = super().get_recipe_env(arch)

pythonforandroid/recipes/qt6/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def get_libraries(self, arch_name, in_context=False):
4848
f'libQt6ShaderTools_{arch_name}.so': 'qtbase/lib',
4949
f'libQt6Svg_{arch_name}.so': 'qtbase/lib',
5050
# f'libQt6Xml_{arch_name}.so': 'qtbase/lib',
51+
f'libQt6Nfc_{arch_name}.so': 'qtbase/lib',
5152

5253
f'libplugins_platforms_qtforandroid_{arch_name}.so': 'qtbase/plugins/platforms',
5354
f'libplugins_imageformats_qjpeg_{arch_name}.so': 'qtbase/plugins/imageformats',
@@ -145,7 +146,7 @@ def build_arch(self, arch):
145146
configure = configure.bake('-nomake', 'examples')
146147
configure = configure.bake('-no-widgets')
147148
configure = configure.bake('-submodules', ','.join(
148-
['qtbase', 'qtdeclarative', 'qtimageformats', 'qtmultimedia']))
149+
['qtbase', 'qtdeclarative', 'qtimageformats', 'qtmultimedia', 'qtconnectivity']))
149150
configure = configure.bake('-skip', ','.join(
150151
# ['qtquick3d', 'qtquick3dphysics', 'qtactiveqt']))
151152
['qtactiveqt']))

0 commit comments

Comments
 (0)