Commit Graph

100 Commits

Author SHA1 Message Date
Martchus dbc5a18801 Allow setting custom app ID and label via CMake args
So one can produce different configurations/versions/flavors of
the app which can be installed at the same time.
2019-08-22 01:05:45 +02:00
Martchus 5f115b4918 Require META_ANDROID_PACKAGE_NAME for making Android APKs 2019-08-22 01:03:53 +02:00
Martchus f1897175e8 Support template substitution for Android files
To achieve this the Android package directory must be copied
over to the binary directory. Files which end with ".in" are
treated as templates.
2019-08-22 01:02:15 +02:00
Martchus ff48e464fa Improve lookup of Qt translations
* Show warning if no translations found but built-in
  translations are enabled
* Don't write empty QStringLiteral to config file
* Simplify CMake code
2019-08-10 00:12:05 +02:00
Martchus 95cc1a5b78 Apply cmake-format 2019-08-07 22:57:31 +02:00
Martchus a40d2974e0 Fix translation lookup if config name is set
In this case the config name must only be appended to the applications
config directory but *not* to the name of the translation file itself.
2019-08-07 22:57:17 +02:00
Martchus d3c9653b9e Add EXCLUDED_FILES variable
When adding source files to the _FILES variables conditionally
those are so far not being formatted or translated. Adding
these files at least to the EXCLUDED_FILES will fix this.

Replaces DOC_ONLY_FILES which served the same purpose but was
limited to documentation.
2019-07-13 14:01:52 +02:00
Martchus 666e16725d Don't add QT_DISABLE_DEPRECATED_BEFORE by default 2019-06-25 14:16:40 +02:00
Martchus ec3d68a635 Apply cmake-format 0.5.1 2019-06-01 12:15:48 +02:00
Martchus 72d0e9e6e0 Adapt search path for translations to new config system 2019-05-05 18:37:24 +02:00
Martchus 2ae98f8ba4 Prevent using deprecated Qt features 2019-05-04 22:16:46 +02:00
Martchus d8333f3793 Apply cmake-format 2019-05-04 21:01:06 +02:00
Martchus 850101dce6 Support installing multiple configurations within the same prefix 2019-05-03 01:03:41 +02:00
Martchus 76f70abdf8 Polish CMake modules 2019-04-22 22:27:00 +02:00
Martchus c707591128 Don't mix building static and shared libraries 2019-04-21 16:44:54 +02:00
Martchus 9e51708da1 Add detection of ANDROID_APK_TOOLCHAIN_VERSION for 32-bit ARM 2019-03-03 21:43:41 +01:00
Martchus 8741195cfe Remove libdir before invoking androiddeployqt
Otherwise it might fail to remove that directory on
its own. (Likely after some subdirectory has accidently
been added.)
2019-02-23 13:51:00 +01:00
Martchus 9dd033996a Fix bundling unnecessary files into APK
So not the entire share folder is bundles. And QML
paths are also not required here (although they contain
come plugin SO files).

There are still unnecessary plugins bundles, though.
2019-02-23 13:48:20 +01:00
Martchus 190e58fe67 Apply cmake-format 2019-02-06 17:32:10 +01:00
Martchus 72d642c892 Allow to specify variables for making APK
So when those variables can not be detected they can at least
be specified manually as command line arguments.
2019-02-03 23:53:22 +01:00
Martchus c24d5c5949 Ensure libs from current build get bundled into APK 2018-12-22 02:11:08 +01:00
Martchus 4ab91f33c0 Add --verbose option to androiddeployqt 2018-12-22 02:10:11 +01:00
Martchus dbb9dfec57 Adjust output directory of APK for Qt 5.12.0 2018-12-22 02:09:43 +01:00
Martchus a97906360f Rebuild APK when modifying contents of android subdir
Still does not work when files get added or removed, though
2018-12-08 19:07:54 +01:00
Martchus 86a84dd3cf Reduce indentation in QtLinkage CMake module 2018-12-05 15:24:04 +01:00
Martchus e7b3ec67c5 APK: Handle Qt being configured with custom paths 2018-12-02 21:44:20 +01:00
Martchus 0bee777a04 APK: Allow forcing debug mode if otherwise in release mode 2018-12-02 21:44:20 +01:00
Martchus d61c3b86bd APK: Fix detection for toolchain version when using Clang 2018-12-02 21:44:20 +01:00
Martchus 530d61fc41 APK: Add check for SDK/NDK path 2018-12-02 21:37:57 +01:00
Martchus 390716a330 Allow to sign release APKs 2018-09-18 22:41:28 +02:00
Martchus 881ed0a2cb Add module to create Android APK using androiddeployqt 2018-09-16 00:38:46 +02:00
Martchus 90ee0c6519 Always link against Qt Qml when Qt Quick GUI enabled 2018-08-31 22:45:24 +02:00
Martchus c48c669095 Make depending on QQC2 for Quick GUI a one-liner 2018-06-16 13:11:18 +02:00
Martchus 1946816ce0 Enable QML debugging if build type is debug 2018-05-23 23:20:58 +02:00
Martchus df76e333fa Fix comments in JavaScript header templates 2018-04-07 19:02:04 +02:00
Martchus 9a90f6b99e Fix definition of @META_PROJECT_VARNAME_UPPER@_NO_JSENGINE 2018-04-07 17:55:28 +02:00
Martchus ccca2f123a Don't care about policy CMP0071 too much
Seems like CMake under Leap is too old so don't enforce
the policy (for now).
2018-03-13 19:57:44 +01:00
Martchus 0409b77831 Split Qt-specific config from other config
So adding Qt-specific config does not require a change
in c++utilities anymore.
2018-03-07 18:22:53 +01:00
Martchus 4980c8df95 Ensure generated sources are processed by AUTOMOC and AUTOUIC 2018-03-07 18:21:47 +01:00
Martchus e6e968e4ea Fix locating Qt's translations under openSUSE 2018-02-10 20:06:45 +01:00
Martchus ad1e6d21ba Prevent installing built-in Qt translations 2018-01-20 22:33:45 +01:00
Martchus 22639edfed Force use of INTERFACE_LINK_LIBRARIES_RELEASE for any config
Ensures we're getting the correct transitive dependencies
for all static Qt modules regardless of the configuration.
2017-12-15 20:35:09 +01:00
Martchus 29a2f993a3 Configure static Qt Widget style plugins
* Fix missing "Vista style" in static, Qt 5.10 based
  Windows build
* Required since the platform styles have been
  "pluginized" in Qt 5.10
* See 4f3249f32d
2017-12-15 20:22:29 +01:00
Martchus 591325aa44 Execute target for updating translations not by default 2017-10-16 09:56:35 +02:00
Martchus b2e3506ff5 Fix adding public Qt modules in pkg-config 2017-10-08 19:40:51 +02:00
Martchus d65835be50 Link only applications against static Qt plugins
* Which plugins should be included should only be decided
  when building the final application and not before.
* Also prevents those libs from appearing in pkg-config
  files.
2017-10-08 19:27:31 +02:00
Martchus ff4f495a5d Make translations of dependencies always available
And not only if the project itself contains translations
2017-09-08 16:46:35 +02:00
Martchus bf1519d357 Improve handling static Qt plugins
* Only link targets using static Qt Gui/Widgets/Quick
  against static plugins since currently only GUI-related
  plugins are relevant
* Don't require to link explicitely against the related
  module (eg. Qt Svg for the Svg icon engine) because the
  imported target of the plugin should pull all required
  dependencies
* Add option for linking against static Qt image format
  plugins
* Link GUI applications using static Qt Gui/Widgets/Quick
  against the static X11 platform integration plugin if it
  is available
2017-09-03 18:03:41 +02:00
Martchus b94c23f238 Distinguish exporting/enabling resources of static libs
Required because we now allow to provide dynamic libs as
dependencies of static libs
2017-08-31 02:14:52 +02:00
Martchus b45f2e7edf Don't include static svg plugin if not using static Qt 2017-08-20 02:23:02 +02:00