Commit Graph

68 Commits

Author SHA1 Message Date
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
Martchus e8b061737c Fix typo 2017-02-11 02:56:28 +01:00
Martchus 48f0a19554 Do not built-in icon themes when building libs
Only including the list of icons required by the final
application should be sufficient as it is supposed to
contain all relevant icons from dependencies, too.
2017-02-11 02:56:19 +01:00
Martchus 26b8f069c6 Improve CMake modules 2017-02-11 02:31:43 +01:00
Martchus 8f2e3f0476 Add macro to auto init resources of static deps
Generated macro code is made available via config
header implemented in c++utilities
2017-02-11 02:04:12 +01:00
Martchus a2edd64dbd Give generated qrc files a unique name 2017-02-09 23:34:13 +01:00
Martchus 557c5d5af9 Fix dependency of res file for built-in translations 2017-02-09 16:20:15 +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 aca86b0681 Load translations of dependencies, too 2017-01-07 16:09:38 +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 c443250989 Add dependencies of localization target correctly 2016-11-12 02:08:02 +01:00
Martchus 6d623989a8 Declare all used Qt module public dependencies 2016-11-10 23:42:53 +01:00
Martchus e1a8a12670 Provide an imported target for libs 2016-11-10 23:42:53 +01:00