4
0
mirror of https://github.com/QuasarApp/qt-android-cmake.git synced 2025-05-04 01:09:37 +00:00

30 Commits

Author SHA1 Message Date
Laurent Gomila
5a62962dbe
Merge pull request from OlivierLDff/support-multi-abi-qt
Support build with Qt5.14, 5.15 with new qtandroiddeploy config file.
2020-06-02 20:53:54 +02:00
Olivier LDff
6c56d64715 Support build with Qt5.14, 5.15 with new qtandroiddeploy config file. Fix issue . 2020-06-02 18:47:03 +02:00
Laurent Gomila
250fdb2caa
Merge pull request from pthom/patch-1
Use env var ANDROID_SDK or ANDROID_SDK_ROOT
2020-05-13 17:47:38 +02:00
Pascal Thomet
d4470e1680
Use env var ANDROID_SDK or ANDROID_SDK_ROOT
Hello,
I have noticed on two platforms (linux and mac) that your project asks for an environment variable ANDROID_SDK.
However, after having installed "Android Studio + QtCreator + Android Sdk" on both platform, I noticed that an environment variable named ANDROID_SDK_ROOT was added automatically (without my intervention).

I propose that AddQtAndroidApk could use indifferently  $ENV{ANDROID_SDK} or ENV{ANDROID_SDK_ROOT}.
2020-05-12 20:38:05 +02:00
Laurent Gomila
fc1dad67e9 Fixed CMake error when CMAKE_BUILD_TYPE is not defined 2020-02-17 14:02:11 +01:00
Laurent Gomila
2f31e0d3b4 Fixed CMake configuration error when PROJECT_VERSION was not defined (i.e. project() not called with VERSION keyword) 2020-02-11 11:34:36 +01:00
Laurent Gomila
8ff95ce400
Merge pull request from LaurentGomila/pr25_cleaning
Refactoring of 
2020-02-03 08:46:36 +01:00
Laurent Gomila
78f06f318c Many fixes and improvements, to work with newer Android NDKs - refactoring of PR by OlivierLDff (olivier.ldff@gmail.com) 2020-01-29 13:18:59 +01:00
Laurent Gomila
e3bd0c4930
Merge pull request from forderud/auto-BUILDTOOLS_REVISION
Auto-detect latest Android SDK build-tools revision
2018-11-26 12:19:47 +01:00
Fredrik Orderud
0d8fc7ef97 Auto-detect latest Android SDK build-tools revision
Done to avoid having to provide this as an argument when calling add_qt_android_apk
2018-11-26 12:02:12 +01:00
Laurent Gomila
767ef735a3 Added missing features and permissions placeholders in default AndroidManifest.xml template 2018-11-08 15:36:20 +01:00
Laurent Gomila
eb1e59c2e3 Added support for NDK versions < r18 toolchains 2018-11-08 15:23:33 +01:00
Laurent Gomila
5bb2cd683b Updated to use the official toolchain provided by the Android NDK 2018-11-08 14:38:07 +01:00
Laurent Gomila
081ee8424a
Merge pull request from dirkhh/QMLfix
Search QML modules and their dependencies
2018-08-06 06:31:00 +02:00
Dirk Hohndel
17acb315af Search QML modules and their dependencies
Otherwise shared libraries that the QML modules might depend on
aren't installed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-08-05 15:02:03 -07:00
Laurent Gomila
46767639c0
Merge pull request from Kakadu/master
Mention workaround about Qt bug 54666
2018-07-22 14:31:50 +02:00
Kakadu
71f40117c2
Mention workaround about Qt bug 54666 2018-07-21 19:15:30 +03:00
Laurent Gomila
7a0a89132c Now builds with gradle instead of ANT (the latter is no longer supported in new Android SDKs) 2017-05-19 14:58:12 +02:00
Laurent Gomila
bc908fcdb5 Fixed incorrect string passed to the --android-platform option of androiddeployqt 2017-05-19 14:10:04 +02:00
Laurent Gomila
e9e51090bf If ANDROID_NATIVE_API_LEVEL is defined by the toolchain, make androiddeployqt use this API level 2017-05-19 12:08:45 +02:00
Laurent Gomila
66615355e2 Updated documentation with the new BUILDTOOLS_REVISION option 2017-02-06 13:12:15 +01:00
Laurent Gomila
035fbdf9c5 Added a BUILDTOOLS_REVISION option to set the Android SDK build-tools revision 2017-02-06 12:11:59 +01:00
Laurent Gomila
365a2946da Added the VERSION_CODE argument to the macro, using a valid default number if not provided (no longer tied to the target's VERSION property)
Increased the minimum SDK version to 18 (required by Qt)
Updated the documentation
2016-08-16 15:09:56 +02:00
Laurent Gomila
19ed20d8dc Fixed typo in readme file 2016-04-18 08:59:58 +02:00
Laurent Gomila
89cb07d950 The INSTALL option no longer uninstalls the app if it is already found on the device (-> keeps the app local data intact) 2015-11-06 11:22:46 +01:00
Laurent Gomila
88cf6b319a Added the --tsa option to avoid a warning when signing the APK 2015-05-12 10:15:12 +02:00
Jean-Michaël Celerier
ace39635db Add quotes around QT_ANDROID_APP_VERSION
Else CMake fails.
2015-02-19 09:38:52 +01:00
Laurent Gomila
4b5ec53748 Fixed dependant libraries not updated in package after being recompiled 2015-02-13 11:38:33 +01:00
Laurent Gomila
8a651d7c43 Fixed incorrect qtdeploy.json file generated in case the app has no dependency 2015-02-12 15:34:57 +01:00
Laurent Gomila
131f82a2ca Initial commit 2015-02-12 13:54:30 +01:00