| Age | Commit message (Collapse) | Author |
|---|
|
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
|
|
set ECM_ADDITIONAL_FIND_ROOT_PATH the same as
CMAKE_PREFIX_PATH if not specified explicitly
from the commandline
reviewed-by:apol
|
|
|
|
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
|
|
Reviewers: #frameworks, cordlandwehr, apol
Reviewed By: apol
Differential Revision: https://phabricator.kde.org/D3732
|
|
|
|
REVIEW: 128780
|
|
GIT_SILENT
|
|
Explains how to install and sign apks
REVIEW: 128634
|
|
Just setting the field android-extra-plugins to an empty string resulted
in androiddeployqt complaining about
"External resource does not exist or not a correct directory!"
so the field is completely left out now if no plugin data dirs are found.
For consistency the same is done with the android-extra-libs field.
REVIEW: 127700
BUG: 362578
Thanks apol for review
|
|
The only reason why it used to work, is because all libraries we're including,
provide *Config.cmake files, which don't respect this setting.
REVIEW: 126896
|
|
Makes sure there isn't old stuff still there, it didn't save much time to
keep the files around anyway.
|
|
* Remove get_property calls on targets, this way we don't need to be called
right before configuration time.
* Removes EOFHook
Instead we process it at generation time using the link.txt file (which is
probably another hack)
REVIEW: 125084
|
|
|
|
QtCore/qsystemdetection.h sets the define Q_OS_ANDROID based on having
ANDROID defined. Hence, adding the ANDROID define allows applications to
use the Q_OS_ANDROID for ifdef'ing.
REVIEW: 125183
|
|
|
|
|
|
Introduces the new Android toolchain file for being able to easily compile
our cmake projects in Android, with an emphasis on Qt projects.
CHANGELOG: New Android toolchain support module.
REVIEW: 121545
|
