diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 17:07:23 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 17:07:23 +0100 |
| commit | 51e7fa714ca76fd9edb342fc8e97451086e46fe3 (patch) | |
| tree | 49caeb7689e53f35437523334ddef8836111a66b /src/plugins/imageformats/CMakeLists.txt | |
| parent | 4c932c40349d837592c6c429fabf2511596e0fd7 (diff) | |
| parent | 10c6352fb384b732e942af9ada4cb8d07a793c45 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ia9a6efda0bea5bc7c5f9f8cd4735da0bd3c0da26
Diffstat (limited to 'src/plugins/imageformats/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions