From 9c09687ec017abb9d35b91338ebdf0827dbe4a73 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Date: Thu, 26 May 2016 15:09:21 +0200
Subject: Enable QQuickItemGrabResult in all builds

No OpenGL specifics in there anymore.

Change-Id: Ib3a0ee316d2c7b72b40b6c0331605edae7ce259b
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
---
 src/quick/items/items.pri                | 12 ++++++------
 src/quick/items/qquickitem.h             |  3 +--
 src/quick/items/qquickitemgrabresult.cpp |  1 -
 src/quick/items/qquickitemsmodule.cpp    |  4 +---
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/quick/items')

diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri
index 1c17e7e34d..eee11e9d75 100644
--- a/src/quick/items/items.pri
+++ b/src/quick/items/items.pri
@@ -78,7 +78,8 @@ HEADERS += \
     $$PWD/qquickgenericshadereffect_p.h \
     $$PWD/qquickrendercontrol.h \
     $$PWD/qquickrendercontrol_p.h \
-    $$PWD/qquickrendererinfo_p.h
+    $$PWD/qquickrendererinfo_p.h \
+    $$PWD/qquickitemgrabresult.h
 
 SOURCES += \
     $$PWD/qquickevents.cpp \
@@ -132,7 +133,8 @@ SOURCES += \
     $$PWD/qquickshadereffect.cpp \
     $$PWD/qquickgenericshadereffect.cpp \
     $$PWD/qquickrendercontrol.cpp \
-    $$PWD/qquickrendererinfo.cpp
+    $$PWD/qquickrendererinfo.cpp \
+    $$PWD/qquickitemgrabresult.cpp
 
 # Items that depend on OpenGL Renderer
 contains(QT_CONFIG, opengl(es1|es2)?) {
@@ -144,8 +146,7 @@ contains(QT_CONFIG, opengl(es1|es2)?) {
         $$PWD/qquickspriteengine.cpp \
         $$PWD/qquicksprite.cpp \
         $$PWD/qquickspritesequence.cpp \
-        $$PWD/qquickanimatedsprite.cpp \
-        $$PWD/qquickitemgrabresult.cpp
+        $$PWD/qquickanimatedsprite.cpp
 
     HEADERS += \
         $$PWD/qquickopenglinfo_p.h \
@@ -155,8 +156,7 @@ contains(QT_CONFIG, opengl(es1|es2)?) {
         $$PWD/qquickanimatedsprite_p.h \
         $$PWD/qquickopenglshadereffect_p.h \
         $$PWD/qquickopenglshadereffectnode_p.h \
-        $$PWD/qquickframebufferobject.h \
-        $$PWD/qquickitemgrabresult.h
+        $$PWD/qquickframebufferobject.h
 
     OTHER_FILES += \
         $$PWD/shaders/sprite.vert \
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 4fd65fbb01..c5c17615ee 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -311,11 +311,10 @@ public:
     bool keepTouchGrab() const;
     void setKeepTouchGrab(bool);
 
-#ifndef QT_NO_OPENGL
     // implemented in qquickitemgrabresult.cpp
     Q_REVISION(2) Q_INVOKABLE bool grabToImage(const QJSValue &callback, const QSize &targetSize = QSize());
     QSharedPointer<QQuickItemGrabResult> grabToImage(const QSize &targetSize = QSize());
-#endif
+
     Q_INVOKABLE virtual bool contains(const QPointF &point) const;
 
     QTransform itemTransform(QQuickItem *, bool *) const;
diff --git a/src/quick/items/qquickitemgrabresult.cpp b/src/quick/items/qquickitemgrabresult.cpp
index 807a2ae304..019352c57a 100644
--- a/src/quick/items/qquickitemgrabresult.cpp
+++ b/src/quick/items/qquickitemgrabresult.cpp
@@ -48,7 +48,6 @@
 #include <private/qquickpixmapcache_p.h>
 #include <private/qquickitem_p.h>
 #include <private/qsgcontext_p.h>
-#include <private/qsgdefaultrendercontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index 3ccbf4b140..e5b82e1102 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -73,8 +73,8 @@
 //#include <private/qquickpincharea_p.h>
 #include <QtQuick/private/qquickcanvasitem_p.h>
 #include <QtQuick/private/qquickcontext2d_p.h>
-#ifndef QT_NO_OPENGL
 # include "qquickitemgrabresult.h"
+#ifndef QT_NO_OPENGL
 # include "qquicksprite_p.h"
 # include "qquickspritesequence_p.h"
 # include "qquickanimatedsprite_p.h"
@@ -182,9 +182,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickTextInput,2>(uri,2,2,"TextInput");
     qmlRegisterType<QQuickTextInput,3>(uri,2,4,"TextInput");
     qmlRegisterType<QQuickViewSection>(uri,major,minor,"ViewSection");
-#ifndef QT_NO_OPENGL
     qmlRegisterType<QQuickItemGrabResult>();
-#endif
     qmlRegisterType<QQuickItemLayer>();
     qmlRegisterType<QQuickAnchors>();
     qmlRegisterType<QQuickKeyEvent>();
-- 
cgit v1.2.3