diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-01 16:26:27 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-01 16:26:27 +0100 |
| commit | 06a04f4acbde2f6ae966c450014102120b887d6a (patch) | |
| tree | fade383f40bdfef720b6a7c38dc36e3533f4cdcb /src/core/type_conversion.cpp | |
| parent | 6c736295cf1ead52f7f4ca99138d678573dab03c (diff) | |
| parent | 4cf520d67f0619330bbf53a743818924d476d95f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib09a8e88efb06413bb8f39e30f1360ce70b04b24
Diffstat (limited to 'src/core/type_conversion.cpp')
| -rw-r--r-- | src/core/type_conversion.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp index ddadeb9f2..aea924dbd 100644 --- a/src/core/type_conversion.cpp +++ b/src/core/type_conversion.cpp @@ -58,6 +58,7 @@ QImage toQImage(const SkBitmap &bitmap) case kUnknown_SkColorType: case kRGBA_F16_SkColorType: case kRGBA_F32_SkColorType: + case kRGBA_F16Norm_SkColorType: qWarning("Unknown or unsupported skia image format"); break; case kAlpha_8_SkColorType: |