summaryrefslogtreecommitdiffstats
path: root/src/core/core_gyp_generator.pro
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-04-20 16:57:29 +0200
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2016-04-21 08:17:37 +0000
commit783db9da6962c331b126f0d2262a0c0600cf46ff (patch)
tree5e1473fbe2421e832f3a752924ddde3bbc1e2748 /src/core/core_gyp_generator.pro
parentd236c5a8a34803bda6115956184398b99dbba408 (diff)
Fix copying images to clipboard
The SkBitmap to QImage conversion in ClipboardQt::WriteBitmap was hardcoding the image format to ARGB32. This failed whenever the format of the SkBitmap provided by Chromium was different. This change backports 1cf9175e from 5.7. Task-number: QTBUG-52715 Change-Id: Icf27b97bc421a2201c307a4514928dcf384d9ba6 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/core_gyp_generator.pro')
-rw-r--r--src/core/core_gyp_generator.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 58e83f954..ab2a1c48e 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -83,6 +83,7 @@ SOURCES = \
ssl_host_state_delegate_qt.cpp \
stream_video_node.cpp \
surface_factory_qt.cpp \
+ type_conversion.cpp \
url_request_context_getter_qt.cpp \
url_request_custom_job.cpp \
url_request_custom_job_delegate.cpp \