qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Laszlo Agocs 2016-05-26 15:09:21 +02:00
parent e1682b84bb
commit 9c09687ec0
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/quick/items/items.pri
View File

@ -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 \

3
src/quick/items/qquickitem.h
View File

@ -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;

1
src/quick/items/qquickitemgrabresult.cpp
View File

@ -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

4
src/quick/items/qquickitemsmodule.cpp
View File

@ -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>();