Commit Graph

37 Commits

Author SHA1 Message Date
Martchus f5d99397ff Avoid CMake deprecation warning by bumping version 2023-07-23 21:18:51 +02:00
Martchus 96f10766d4 Enable web view support only by default if Qt WebEngine is present
The web view is only an optional enhancement in my applications so having
the support disabled is rather common. So for a better out-of-the-box
experience when configuring my projects it makes sense not having to
disable web view support explicitly if Qt WebEngine is not installed
anyways.
2023-06-10 18:08:13 +02:00
Martchus 752c8cdc71 Link builds using static Qt also against Wayland shell integration plugins
These are required; the Wayland integration plugin alone is not sufficient.
2022-05-02 20:15:07 +02:00
Martchus b3896eb65e Check for relative paths also under install prefix
In the "normal" case none of the other variables are set
and thus relative paths (e.g. for the plugin directory)
cannot be resolved. This should still work when
CMAKE_FIND_ROOT_PATH is set beause we still check within
the other locations.
2021-11-04 23:22:26 +01:00
Martchus 67e3d8b4af Apply cmake-format 2021-07-03 19:14:24 +02:00
Martchus 7792012916 Avoid error with CMake < 3.12 2021-04-06 18:11:21 +02:00
Martchus d6ea2ac378 Apply cmake-format and clang-format 2020-12-20 17:56:35 +01:00
Martchus 9bc3555c99 Resolve QT_INSTALL_TRANSLATIONS via CMAKE_PREFIX_PATH if it is relative
The variables provided by Qt 6 might just contain a relative path. This
change adds an extra function resolve these via CMAKE_PREFIX_PATH and
CMAKE_FIND_ROOT_PATH.
2020-11-11 18:51:19 +01:00
Martchus 09ff2d00b1 Replace META_QT5_VERSION with version-agnostic META_QT_VERSION 2020-11-07 21:38:18 +01:00
Martchus deb9b4467f Look for Svg plugins within the Gui module's directory as well
In Qt 5  these plugins were loaded as part of the Svg module (at least with
my patches). With Qt 6 (for which I've dropped my patches) we need to
include the plugin's config file manually.
2020-11-07 21:38:18 +01:00
Martchus 89152bdbe9 Fix passing arguments when configuring Qt plugins 2020-11-03 18:32:35 +01:00
Martchus 4f06492306 Apply cmake-format 2020-10-10 00:50:40 +02:00
Martchus 15c884153a Allow building for Android with latest NDK, Qt 5 and CMake
* Making an Android APK should now generally work with NDK r21.d and
  Qt 5.15.1 and CMake 3.18 although some details might still need tweaking
* It is now supposed to be used within the NDK's toolchain instead of
  CMake's built-in Android support (which makes problems with newer NDK
  versions)
* The old way to lookup/pass variables is preserved so it should still
  work with older Qt versions and CMake's built-in Android support
* Qt's own support for invoking androiddeployqt needed to be disabled
  because it lead to CMake errors (see comment)
2020-10-05 18:37:23 +02:00
Martchus cb3a4960e7 Support Qt 6 (commit 174154b) 2020-09-04 00:44:48 +02:00
Martchus 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
Martchus b8d00d27c9 Apply cmake-format v0.6.0 2019-11-30 17:58:56 +01:00
Martchus ec3d68a635 Apply cmake-format 0.5.1 2019-06-01 12:15:48 +02:00
Martchus d8333f3793 Apply cmake-format 2019-05-04 21:01:06 +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 190e58fe67 Apply cmake-format 2019-02-06 17:32:10 +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 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 b2e3506ff5 Fix adding public Qt modules in pkg-config 2017-10-08 19:40:51 +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 bbee85ce07 Fix using static Qt without 'Static' prefix 2017-08-06 00:43:09 +02:00
Martchus 1d49f41582 Fix marking Qt module deps as public 2017-04-22 20:57:57 +02:00
Martchus 26b8f069c6 Improve CMake modules 2017-02-11 02:31:43 +01:00
Martchus 0ccee40fa4 Check for Qt 5.6 or higher by default
which is required by qtutilities itself and most other
projects eg. Tag Editor
2017-02-06 21:35:08 +01:00
Martchus 3c2c8ed650 Fix reverse lookup for pc and 'StaticQt5::' 2016-12-13 20:23:20 +01:00
Martchus 653d954a54 Fix use of static Qt 5 plugins 2016-11-26 21:58:42 +01:00
Martchus 70a9d68555 Use StaticQt5::* for static Qt5 imported targets
Fallback to old version (Qt5::static::*) if not found
2016-11-12 02:24:06 +01:00
Martchus e1a8a12670 Provide an imported target for libs 2016-11-10 23:42:53 +01:00
Martchus d9380d024e Allow building shared and static libs at the same time
Use 'Static'-prefixed CMake modules provided by patched
mingw-w64-qt5 packages
2016-10-29 00:26:06 +02:00
Martchus 812f2d2afd Fix indentation of QtLinkage.cmake 2016-09-11 23:11:19 +02:00
Martchus 7f9afcda73 Fix decoration for static builds
- Also fix finding static web view and JavaScript provider
2016-08-29 15:41:21 +02:00