qmlRegisterType<QQuickPinch>(uri,major,minor,"Pinch");
qmlRegisterType<QQuickPinchEvent>();
- qmlRegisterType<QQuickShaderEffectItem>("QtQuick", 2, 0, "ShaderEffectItem"); // TODO: Remove after grace period.
qmlRegisterType<QQuickShaderEffect>("QtQuick", 2, 0, "ShaderEffect");
qmlRegisterType<QQuickShaderEffectSource>("QtQuick", 2, 0, "ShaderEffectSource");
qmlRegisterUncreatableType<QQuickShaderEffectMesh>("QtQuick", 2, 0, "ShaderEffectMesh", QQuickShaderEffectMesh::tr("Cannot create instance of abstract class ShaderEffectMesh."));
return qt_texcoord_attribute_name;
}
-// TODO: Remove after grace period.
-QQuickShaderEffectItem::QQuickShaderEffectItem(QQuickItem *parent)
- : QQuickShaderEffect(parent)
-{
- qWarning("ShaderEffectItem has been deprecated. Use ShaderEffect instead.");
-}
-
-
/*!
\qmlclass ShaderEffect QQuickShaderEffect
\inqmlmodule QtQuick 2
const int matLen = sizeof("qt_Matrix") - 1;
const int opLen = sizeof("qt_Opacity") - 1;
- const int mvpMatLen = sizeof("qt_ModelViewProjectionMatrix") - 1;
const int sampLen = sizeof("sampler2D") - 1;
if (nameLength == matLen && qstrncmp("qt_Matrix", s + nameIndex, matLen) == 0) {
m_source.respectsMatrix = true;
- } else if (nameLength == mvpMatLen && qstrncmp("qt_ModelViewProjectionMatrix",
- s + nameIndex, mvpMatLen) == 0)
- {
- // TODO: Remove after grace period.
- qWarning("ShaderEffect: qt_ModelViewProjectionMatrix is deprecated. Use qt_Matrix instead.");
- m_source.respectsMatrix = true;
} else if (nameLength == opLen && qstrncmp("qt_Opacity", s + nameIndex, opLen) == 0) {
m_source.respectsOpacity = true;
} else {
{
m_opacityLoc = program()->uniformLocation("qt_Opacity");
m_matrixLoc = program()->uniformLocation("qt_Matrix");
- // TODO: Remove after grace period.
- if (m_matrixLoc == -1)
- m_matrixLoc = program()->uniformLocation("qt_ModelViewProjectionMatrix");
}
const char *QQuickCustomMaterialShader::vertexShader() const