From 547a61a433e2e035d8386c6534c1f86381e57cc7 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 1 Mar 2017 17:27:50 +0100
Subject: [Reland] Add QSharedPointer<QQuickItemGrabResult> to the type system

Also add test to check that calling QQuickItem::grabToImage() works
correctly.

The QSharedPointer type is added in the QtQuick typesystem file
and not in QtCore to minimize the surface of issues that might come up,
as well as because that's the only reasonable use case of QSharedPointer
in the public API so far.

The commit was missing in 5.9 branch after repo merge.

Task-number: PYSIDE-454
Change-Id: Ibb7775117ffb22ab91d2ac798ae13cc9e4856587
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 sources/pyside2/PySide2/QtQuick/CMakeLists.txt       | 1 +
 sources/pyside2/PySide2/QtQuick/typesystem_quick.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'sources/pyside2/PySide2')

diff --git a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
index 11cbdf750..491fc9d9e 100644
--- a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
@@ -11,6 +11,7 @@ ${QtQuick_GEN_DIR}/qquicktransform_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickitem_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickitem_updatepaintnodedata_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickitemgrabresult_wrapper.cpp
+${QtQuick_GEN_DIR}/qsharedpointer_qquickitemgrabresult_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickpainteditem_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickrendercontrol_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquicktextdocument_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
index 0bee346ba..4cee02eec 100644
--- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
+++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
@@ -46,6 +46,7 @@
     <load-typesystem name="typesystem_qml.xml" generate="no"/>
 
     <primitive-type name="GLuint"/>
+    <smart-pointer-type name="QSharedPointer" type="shared" getter="data" />
 
     <extra-includes>
         <include file-name="pysidequickregistertype.h" location="local"/>
-- 
cgit v1.2.3