diff options
| author | Tim Blechmann <[email protected]> | 2025-07-02 09:38:00 +0800 |
|---|---|---|
| committer | Tim Blechmann <[email protected]> | 2025-07-03 09:05:10 +0800 |
| commit | 6f92aada9abd4ec8e83e38eb953e987558af796d (patch) | |
| tree | 6e1c15e32c9d0916e5441407a2940ca261b49ab8 /src | |
| parent | 0a4e5840a59cacbaedb8af058725fdc1804e5887 (diff) | |
Q_DECLARE_JNI_CLASS leaks declarations into other translation units. To
make unity builds work, we exclude some cpp files.
Pick-to: 6.10
Change-Id: I572b61ee257ef44a4164fec9ac3e6bbec1c196e2
Reviewed-by: Assam Boudjelthia <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/android/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 0160e12c26c..0d2a048abde 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -51,7 +51,12 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin qandroidplatformdialoghelpers.cpp # Conflicting JNI classes, and types androidcontentfileengine.cpp + qandroidplatformforeignwindow.cpp qandroidplatformintegration.cpp + qandroidplatformscreen.cpp + qandroidplatformservices.cpp + qandroidplatformwindow.cpp + qandroidsystemlocale.cpp INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${QtBase_SOURCE_DIR}/src/3rdparty/android |