From 9d2df53348d907ad682e5e4e3c7dab64637a7657 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 17 May 2016 18:24:26 +0200 Subject: Fix ClipboardChangeObserver The meta type for QClipboard::Mode must be registered, because we're passing it from the application thread to the IO thread. Without this registration, one can trigger Qt metaobject warnings by alternating between copying text and copying images to the clipboard. Change-Id: I0f7f69a3e80c6b2326be0a0c562c867063449fa5 Reviewed-by: Kai Koehne --- src/core/clipboard_qt.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp index e632c5583..93f239f63 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -53,6 +53,13 @@ namespace QtWebEngineCore { +static void registerMetaTypes() +{ + qRegisterMetaType("QClipboard::Mode"); +} + +Q_CONSTRUCTOR_FUNCTION(registerMetaTypes) + Q_GLOBAL_STATIC(ClipboardChangeObserver, clipboardChangeObserver) ClipboardChangeObserver::ClipboardChangeObserver() -- cgit v1.2.3