delta/qt5/qtbase.git/src/android/java, branch dev

src: Remove remains of qmake conversion from CMakeLists.txt files

2023-02-10T22:36:51+00:00

Pick-to: 6.5
Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3
Reviewed-by: Alexey Edelev

Add Q_TRACE_LOCATION to android support

2023-02-09T06:43:49+00:00

This is needed for tracing android devices.

Pick-to: 6.5
Change-Id: Ic04e15b43b426bdb1232e671acb4163165eab666
Reviewed-by: Hatem ElKharashy 
Reviewed-by: Tomi Korpipää 
Reviewed-by: Janne Koskinen

Revert "Revert "Add support for MultiABI with custom install dir of the android-build""

2023-02-02T18:03:36+00:00

This reverts commit d7e8d5bb1b5a9c4b21a3d824780c672eaf4e56b1.

Reason for revert: Found a working solution for the issue.

Change-Id: Ia720cc63ece9dfb1a24067cdd9c3d79d4edbe3be
Reviewed-by: Alexandru Croitor 
Reviewed-by: Assam Boudjelthia

Revert "Add support for MultiABI with custom install dir of the android-build"

2023-02-01T16:18:55+00:00

This reverts commit 979a21dc4ee0c6f483c6b55e9242a153d659ab6f.

Reason for revert: Caused QTBUG-110836

Task-number: QTBUG-110836
Change-Id: I4f31018954e6bb0f4e7b6db0df76d04c0a56d9b1
Reviewed-by: Alexandru Croitor

Add support for MultiABI with custom install dir of the android-build

2023-01-30T13:08:14+00:00

Right now, "multi abi builds" of android projects works only if the
android-build installation doesn't use custom install dirs
(INSTALL_PREFIX, INSTALL_BINDIR...)

At the same time, it fixes QTBUG-106533. The patches are the same as the
ones in that bugreport.

Add new items to android-*-deployment-settings.json:

    qtDataDirectory
    qtLibsDirectory
    qtLibExecsDirectory
    qtPluginsDirectory
    qtQmlDirectory

Update androiddeployqt to be able to get files from their install location

BTW (fixes QTBUG-106533):
    Install src/android/templates into INSTALL_DATADIR
    Install src/3rdparty/gradle into INSTALL_DATADIR
    Install src/android/java files into INSTALL_DATADIR
    Install all jars into INSTALL_DATADIR

Add missing path to target_qt.conf
    Update target_qt.conf to have all path. Otherwise qmake wouldn't have
    the path when installing the android-build with custom install dirs
    like INSTALL_LIBDIR & friends

Add support for a new cmake variable that can be set at build time of the
android projects: QT_ANDROID_PATH_CMAKE_DIR_${abi} (Name chosen as
brother of QT_HOST_PATH_CMAKE_DIR)

Pick-to: 6.5
Fixes: QTBUG-106533
Fixes: QTBUG-107207
Change-Id: Ia3751362ab1b5f877ecafbe02f263feac167119c
Reviewed-by: Qt CI Bot 
Reviewed-by: Alexandru Croitor

Android: Fix deprecations AlertDialog.setButton()

2022-12-21T00:28:56+00:00

https://developer.android.com/reference/android/app/
AlertDialog#setButton(java.lang.CharSequence,
%20android.content.DialogInterface.OnClickListener)

Pick-to: 6.5 6.4 6.2 5.15
Change-Id: I470acba581b7226b2d4a56754cf6372baa167eb4
Reviewed-by: Ville Voutilainen

CMake:Android: copy templates, bindings and gradle files pre_build

2022-12-09T13:25:02+00:00

At the moment when doing a non-prefix build and changing some of those
files, CMake will not update the changes to the build folder unless
done manually or a re-configure is done manually.

qt_copy_or_install() only does copy those files at configure time once,
and using CMAKE_CONFIGURE_DEPENDS would be an overkill here and even
a bit of an extra annoyance, so in this case having a custom command
seem to be suitable.

Done-with: Alexey Edelev 
Change-Id: I55aa9e9d3eea32a4bb54c64abd4cbdcb891c44b6
Reviewed-by: Alexandru Croitor 
Reviewed-by: Alexey Edelev

CMake:Android: add Android templates, bindings and gradle files to tree

2022-12-02T10:29:24+00:00

Add Android templates, bindings and gradle wrapper files to custom
targets so they can be easily tracked by the project tree when using
Qt Creator for example.

Change-Id: I4144b9ee461139a9f768c57b14139e0fc21d4c28
Reviewed-by: Alexandru Croitor 
Reviewed-by: Jörg Bornemann

Android: Handle light/dark mode changes

2022-10-26T15:13:44+00:00

Update Theme's style according to current UiMode.

New style.json file for dark mode was added (stored in separate
subdirectory 'darkUiMode/'). Theme_DeviceDefault_DayNight[0] is used for
extraction for API 29 or higher. Style is updated each time when UiMode
is changed.

[0]https://developer.android.com/reference/android/R.style#Theme_DeviceDefault_DayNight

Task-number: QTBUG-83185
Pick-to: 6.4 6.2
Change-Id: Id26059231f41761d822d494ac6c641bf3cba3322
Reviewed-by: Assam Boudjelthia

Use SPDX license identifiers lefovers for some Java files

2022-10-04T16:18:22+00:00

Replace the current license disclaimer in files by
a SPDX-License-Identifier.

This amends 05fc3aef53348fb58be6308076e000825b704e58.

Pick-to: 6.4
Change-Id: Ie6bbdcd0d764ce1295f45f2d41d7c1c1ab47d9a8
Reviewed-by: Jörg Bornemann