diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-17 13:19:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-18 07:21:18 +0200 |
| commit | 03b666a967fb7501248e9f40a5b187ec3a16c453 (patch) | |
| tree | 7e189a84f50076e24aa5754c1084704272781739 | |
| parent | ffb87007433752fb006655cdba823f93045e4103 (diff) | |
Prospective fix when using QtLottie in QML apps with cmake and static linkagev5.14.0-alpha1
We need to create the cmake integration files to enable static linking.
We don't need to test application side direct linkage though, as the
bodymoving module is private and has no header files (interface).
Change-Id: I4e469727100954abc338edef3ff4bb8e0a1c6579
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | src/bodymovin/bodymovin.pro | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 281a385..3e66c5a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,5 @@ load(qt_build_config) CONFIG += warning_clean -CONFIG -= create_cmake DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST diff --git a/src/bodymovin/bodymovin.pro b/src/bodymovin/bodymovin.pro index c50cad8..5661c4a 100644 --- a/src/bodymovin/bodymovin.pro +++ b/src/bodymovin/bodymovin.pro @@ -8,6 +8,8 @@ TARGET = QtBodymovin MODULE = bodymovin CONFIG += internal_module +# As long as this is an internal module, we do not need to have cmake linkage tests. +CMAKE_MODULE_TESTS = - QT += gui-private |