Commit Graph

109 Commits

Author SHA1 Message Date
9b7ad3375c Avoid hard-coding Qt version in function invocations
* Make use of "Version-less CMake targets", see
  https://www.qt.io/blog/versionless-cmake-targets-qt-5.15
* Keep fallbacks for compatibility with Qt < 5.15
* Remove some other occurrences of hard-coded Qt versions
2020-04-27 23:47:08 +02:00
54e8ef75cd Fix comments mentioning qtconfig.h
There is a separate Qt-specific header since v6.
2020-03-17 19:56:32 +01:00
d33cf13923 Apply cmake-format 2020-03-08 13:51:36 +01:00
031378e1c5 Fix remaining install dirs to use GNUInstallDirs consistently 2020-02-13 11:43:29 +01:00
fc76422d01 Use GNUInstallDirs
See https://github.com/Martchus/cpp-utilities/issues/17
2020-02-01 00:01:37 +01:00
e55ae3686b Require CMake 3.3.0 in all modules 2020-01-10 18:01:27 +01:00
ca081697df Reformat CMake scripts against cmake-format 0.6.3 2019-12-15 19:27:26 +01:00
b8d00d27c9 Apply cmake-format v0.6.0 2019-11-30 17:58:56 +01:00
a635b38e73 Apply CMake format 2019-10-12 19:00:24 +02:00
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
5f115b4918 Require META_ANDROID_PACKAGE_NAME for making Android APKs 2019-08-22 01:03:53 +02:00
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
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
95cc1a5b78 Apply cmake-format 2019-08-07 22:57:31 +02:00
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
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
666e16725d Don't add QT_DISABLE_DEPRECATED_BEFORE by default 2019-06-25 14:16:40 +02:00
ec3d68a635 Apply cmake-format 0.5.1 2019-06-01 12:15:48 +02:00
72d0e9e6e0 Adapt search path for translations to new config system 2019-05-05 18:37:24 +02:00
2ae98f8ba4 Prevent using deprecated Qt features 2019-05-04 22:16:46 +02:00
d8333f3793 Apply cmake-format 2019-05-04 21:01:06 +02:00
850101dce6 Support installing multiple configurations within the same prefix 2019-05-03 01:03:41 +02:00
76f70abdf8 Polish CMake modules 2019-04-22 22:27:00 +02:00
c707591128 Don't mix building static and shared libraries 2019-04-21 16:44:54 +02:00
9e51708da1 Add detection of ANDROID_APK_TOOLCHAIN_VERSION for 32-bit ARM 2019-03-03 21:43:41 +01:00
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
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
190e58fe67 Apply cmake-format 2019-02-06 17:32:10 +01:00
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
c24d5c5949 Ensure libs from current build get bundled into APK 2018-12-22 02:11:08 +01:00
4ab91f33c0 Add --verbose option to androiddeployqt 2018-12-22 02:10:11 +01:00
dbb9dfec57 Adjust output directory of APK for Qt 5.12.0 2018-12-22 02:09:43 +01:00
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
86a84dd3cf Reduce indentation in QtLinkage CMake module 2018-12-05 15:24:04 +01:00
e7b3ec67c5 APK: Handle Qt being configured with custom paths 2018-12-02 21:44:20 +01:00
0bee777a04 APK: Allow forcing debug mode if otherwise in release mode 2018-12-02 21:44:20 +01:00
d61c3b86bd APK: Fix detection for toolchain version when using Clang 2018-12-02 21:44:20 +01:00
530d61fc41 APK: Add check for SDK/NDK path 2018-12-02 21:37:57 +01:00
390716a330 Allow to sign release APKs 2018-09-18 22:41:28 +02:00
881ed0a2cb Add module to create Android APK using androiddeployqt 2018-09-16 00:38:46 +02:00
90ee0c6519 Always link against Qt Qml when Qt Quick GUI enabled 2018-08-31 22:45:24 +02:00
c48c669095 Make depending on QQC2 for Quick GUI a one-liner 2018-06-16 13:11:18 +02:00
1946816ce0 Enable QML debugging if build type is debug 2018-05-23 23:20:58 +02:00
df76e333fa Fix comments in JavaScript header templates 2018-04-07 19:02:04 +02:00
9a90f6b99e Fix definition of @META_PROJECT_VARNAME_UPPER@_NO_JSENGINE 2018-04-07 17:55:28 +02:00
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
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
4980c8df95 Ensure generated sources are processed by AUTOMOC and AUTOUIC 2018-03-07 18:21:47 +01:00
e6e968e4ea Fix locating Qt's translations under openSUSE 2018-02-10 20:06:45 +01:00
ad1e6d21ba Prevent installing built-in Qt translations 2018-01-20 22:33:45 +01:00