Qt 6.8.3 with BlackBerry 10 (QNX 8 / ARMv7) patches
 
 
 
 
 
 
Go to file
Volker Hilsheimer de23caa4f6 JNI: don't declare namespaces nested into QtJniTypes as inline
Sadly, inline namespaces are resulting in ambiguities. With two
declarations

    QtJniTypes::android::io::File

and

    QtJniTypes::org::qtproject::qt::android::QtWindow

referring to QtJniTypes::android already is ambiguous if `org`,
`qtproject`, and `qt` namespaces are all inline. This breaks the
idea behind Q_DECLARE_JNI_CLASS as a variadic macro that generates types
that we can transparently use as QtJniTypes.

So remove the inline keyword from the namespace declarations. The macro
might still be the way to go, but user code will to either fully qualify
the types, or use `using namespace QtJniTypes::java::lang` to use e.g.
the `String` type without ambiguities.

Types declared with the two-argument overload continue to live
directly in the QtJniTypes namespace anyway.

As a drive-by, break the excessively long lines.

Change-Id: Ie9303e6c9117fb96b3cff31c7df4df92237b5520
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit d1b89671de70ac9ffca52337058e976d86a367c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-06-23 03:39:05 +00:00
.github/workflows
LICENSES SQLite: Update identified license 2024-04-28 12:14:17 +02:00
bin cmake: Override generator for iOS projects to Xcode in qt-cmake.in 2024-03-18 22:34:48 +01:00
cmake CMake: disable the GCC -Wstringop-overread warning-error everywhere 2024-06-20 22:59:09 +00:00
coin coin: CMake: Add instructions to generate JSON and verify the SBOM 2024-06-20 19:29:55 +00:00
config.tests Add copyright and licensing to .cpp and .h files missing them 2024-05-28 09:47:01 +02:00
dist Remove dist/README 2024-02-29 15:35:57 +01:00
doc Android: Update Gradle to 8.7 and Android Gradle Plug-in (AGP) to 8.4.0 2024-05-24 06:37:13 +03:00
examples Widget gallery example: set color scheme before constructing UI 2024-06-11 19:35:30 +00:00
lib
libexec CMake: Allow building all examples as standalone just like tests 2024-03-14 11:44:16 +01:00
mkspecs wasm: remove DEMANGLE_SUPPORT 2024-06-20 12:51:27 +00:00
qmake CMake: Annotate some targets with SBOM information 2024-06-17 15:54:26 +02:00
src JNI: don't declare namespaces nested into QtJniTypes as inline 2024-06-23 03:39:05 +00:00
tests JNI: don't declare namespaces nested into QtJniTypes as inline 2024-06-23 03:39:05 +00:00
util qlocalexml2cpp.py: rework StringData handling of bit-sizes 2024-06-02 15:26:17 +02:00
.cmake.conf Add preliminary support for Qt for visionOS 2024-04-18 05:00:57 +02:00
.gitattributes
.gitignore Git ignore Visual Studio CMake build directories 2023-11-24 23:42:05 +01:00
.lgtm.yml
.tag
CMakeLists.txt cmake: add _extra_files IDE target from heuristics 2024-04-12 08:36:01 +08:00
config_help.txt CMake: Generate an SPDX v2.3 SBOM file for each built repository 2024-06-13 14:55:07 +00:00
configure Change configure license 2024-02-02 15:23:02 +00:00
configure.bat configure.bat: Fix errors on Windows 2024-03-05 11:56:24 +01:00
configure.cmake CMake: Emit the 'msvc_obj_debug_info' feature only when MSVC is used 2024-06-10 22:25:32 +00:00
dependencies.yaml
licenseRule.json Add license exception 2024-04-24 19:02:09 +02:00
qt_cmdline.cmake configure: accept -c++std c++17 again 2024-06-13 20:40:06 +00:00