Commit Graph

82 Commits

Author SHA1 Message Date
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
Martchus 260b8217da Use Svg module when linking statically against related plugins
Seems to be required, otherwise getting linker errors.
2017-08-11 22:13:44 +02:00
Martchus 7c6483f5a6 Link GUI apps against Cocoa integration plugin under MacOS 2017-08-06 00:44:20 +02:00
Martchus bbee85ce07 Fix using static Qt without 'Static' prefix 2017-08-06 00:43:09 +02:00
Martchus 2d155e48ac Avoid duplicate resource initialization 2017-08-06 00:41:00 +02:00
Martchus e2bf82214d Make translations optional 2017-08-06 00:40:11 +02:00
Martchus 3e72eadc00 Allow specifying options for lupdate 2017-08-01 10:47:27 +02:00
Martchus 9741ff26ab Allow disabling install targets
Might be useful if install targets cause
problems, eg. under MacOS
2017-07-20 01:43:48 +02:00
Martchus d3de8e5c62 Don't append generated D-Bus files to sources
Allows to distinguish generated files for coverage
report
2017-07-09 23:45:17 +02:00
Martchus 61a544d42f Make definitions for gui support project specific 2017-04-27 22:03:37 +02:00
Martchus 1d49f41582 Fix marking Qt module deps as public 2017-04-22 20:57:57 +02:00
Martchus 784781b409 Set 'MACOSX_BUNDLE' for GUI apps under MacOS
This makes it a GUI executable that can be launched from
the Finder. Not tested yet.
2017-03-29 00:17:26 +02:00
Martchus 263418b9d5 Provide header files to select Qt Script/QML
Allows supporting Qt Script and Qt QML as JavaScript
provider at the same time more conveniently
2017-03-14 23:24:04 +01:00
Martchus 8151d1c23a Fail if definition for web view provider missing 2017-03-14 22:57:08 +01:00
Martchus 14c3c7690a Provide header files to select Qt WebKit/WebEngine
Allows supporting Qt WebKit and Qt WebEngine at the
same time more conveniently
2017-03-14 22:45:33 +01:00
Martchus 12133a26fd Make QM_FILES only additional cond for built-in translations
There might be external translations to be built-in (eg. Qt
translations).
2017-02-26 18:42:08 +01:00
Martchus f6e1f6adcf Only include Qt translations when building the final app
Otherwise the files are also included for each single
library unnecessarily increasing the binary size
2017-02-26 18:40:06 +01:00
Martchus aae9fd5c85 Fix messages in QtGuiConfig 2017-02-20 20:04:33 +01:00
Martchus 2777498f6d Allow customizing install dir for Qt plugins 2017-02-20 20:03:57 +01:00