extra-cmake-modules.git/toolchain, branch v5.38.0-rc2

Add --gradle to androiddeployqt

2017-08-02T18:41:22+00:00

Otherwise when trying to build with the newest Qt/android toolchains it
fails

Differential Revision: https://phabricator.kde.org/D6875

Fix install apk target

2017-08-02T18:40:55+00:00

Differential Revision: https://phabricator.kde.org/D6876

Properly point at ECM

2017-07-13T16:46:16+00:00

Fix typo

Android: scan for qml files in the source dir, not in the install dir.

2017-07-08T10:52:07+00:00

Summary:
When the QML files are all bundled into a .qrc file, they don't get
copied to the install dir, which would lead to qmlimportscanner not picking
up the dependencies (e.g. QtQuick Controls) for android packaging.

Looking at commit 1b0496d, I wonder if maybe we should be able to specify
two paths to look into? But qmlimportscanner doesn't support that, does it?

Test Plan:
using this toolchain for a basic QtQuick2 app created from a
QtCreator template, with Qt Quick Controls support, and QML files
in a Qt resource.

Reviewers: apol, mart

Reviewed By: apol

Subscribers: #build_system, #frameworks

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D6466

scan the whole install folder for qml dependencies

2017-06-05T15:03:36+00:00

Summary:
set qml-root-path as the root install folder
of the application, as is used to scan for
import dependencies, and both qml files in share should be scanned
as well as other qml imports that may be installed in /lib

Test Plan: kirigami gallery deployment has again all the needed dependencies

Reviewers: apol

Reviewed By: apol

Subscribers: #frameworks, #build_system

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D6103

Improve error messages

2017-03-17T16:17:22+00:00

Specify qml-root-path as the share directory in the prefix

2017-03-16T14:11:55+00:00

Summary:
This way androiddeployqt will scan the imports.
Otherwise it wouldn't pull qtquickcontrols2 for me

Reviewers: #build_system, #frameworks, mart

Reviewed By: mart

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D5067

default for ECM_ADDITIONAL_FIND_ROOT_PATH

2017-03-16T13:57:28+00:00

set ECM_ADDITIONAL_FIND_ROOT_PATH the same as
CMAKE_PREFIX_PATH if not specified explicitly
from the commandline
reviewed-by:apol

Fix missing :: in API docs to trigger code styling

2016-12-21T07:29:00+00:00

Ignore host libs/includes/cmakeconfig files in Android toolchain

2016-12-19T19:01:11+00:00

Summary:
Currently (since 123d0d14017a25fb387efd8fe3c2c1323f9c3815) any
find_library() and find_path() calls look both at the host and the toolchain
paths, which often results in includes and/or libraries wrongly being picked
up from the host system, which then results in a failed build.
CMake config files have always been also looked for on the host, which
most often also is not wanted and resulting in a failed build.

This patch fixes that by changing the mode for finding libraries,
includes & packages to ONLY (again), as also recommended in the
cmake-toolchains documentation.

While before CMAKE_PREFIX_PATH was recommended to let cmake e.g.
discover the Qt5 for Android libs, this patch wants a custom
variable ECM_ADDITIONAL_FIND_ROOT_PATH to be used instead.
Reason is that CMAKE_PREFIX_PATH would be subject to the root
handling, while here instead the root paths themselves are
wanted.
This patch does not add backward compatibility for still passing
the Qt5 install prefix via CMAKE_PREFIX_PATH, as there are not
that many users known yet and the old code did not work for many
anyway, so the extra code hassle is not worth it. Instead the few
build instructions would need to be updated (and should ask to use
latest ECM in any case).

Test Plan:
Building Marble now works without trying to use stuff from the
host system.

Reviewers: #frameworks, #gcompris, #minuet, mutlaqja, sandsmark, cordlandwehr, nienhueser, apol

Reviewed By: cordlandwehr, nienhueser, apol

Differential Revision: https://phabricator.kde.org/D3646