Build fix for -no-feature-quick-shadereffect
Change-Id: Ie1f601c6ae4c6c5d8d23b14a6670979d9c24e209 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
parent
42e098fa0a
commit
182469fc85
|
@ -20,7 +20,7 @@ qtHaveModule(quick) {
|
|||
sharedimage \
|
||||
testlib
|
||||
|
||||
qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \
|
||||
qtConfig(quick-shadereffect):qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \
|
||||
SUBDIRS += particles
|
||||
}
|
||||
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
#include <private/qquickcontext2d_p.h>
|
||||
#include <private/qquickcontext2dtexture_p.h>
|
||||
#include <private/qsgadaptationlayer_p.h>
|
||||
#include <qsgtextureprovider.h>
|
||||
#include <QtQuick/private/qquickpixmapcache_p.h>
|
||||
#include <QtGui/QGuiApplication>
|
||||
|
||||
|
|
|
@ -42,7 +42,9 @@
|
|||
#include "qquickcanvasitem_p.h"
|
||||
#include <private/qquickcontext2dtexture_p.h>
|
||||
#include <private/qquickitem_p.h>
|
||||
#if QT_CONFIG(quick_shadereffect)
|
||||
#include <QtQuick/private/qquickshadereffectsource_p.h>
|
||||
#endif
|
||||
#include <qsgrendererinterface.h>
|
||||
|
||||
#include <QtQuick/private/qsgcontext_p.h>
|
||||
|
|
|
@ -52,6 +52,7 @@
|
|||
//
|
||||
|
||||
#include "qquickitem_p.h"
|
||||
#include "qquickpainteditem.h"
|
||||
#include <QtGui/qcolor.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
|
|
@ -345,12 +345,13 @@ void QQuickTransformAnimatorJob::postSync()
|
|||
}
|
||||
|
||||
QQuickItemPrivate *d = QQuickItemPrivate::get(m_target);
|
||||
#if QT_CONFIG(quick_shadereffect)
|
||||
if (d->extra.isAllocated()
|
||||
&& d->extra->layer
|
||||
&& d->extra->layer->enabled()) {
|
||||
d = QQuickItemPrivate::get(d->extra->layer->m_effectSource);
|
||||
}
|
||||
|
||||
#endif
|
||||
m_helper->node = d->itemNode();
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ qtHaveModule(gui):qtConfig(animation) {
|
|||
quick \
|
||||
qmltest
|
||||
|
||||
qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \
|
||||
qtConfig(quick-shadereffect):qtConfig(quick-sprite):qtConfig(opengl(es1|es2)?): \
|
||||
SUBDIRS += particles
|
||||
qtHaveModule(widgets): SUBDIRS += quickwidgets
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue