diff options
Diffstat (limited to 'src/quick/util/qquickanimatorjob.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index 8879ef1e57..b46e2db258 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -43,7 +43,7 @@ #include "qquickanimator_p.h" #include "qquickanimator_p_p.h" #include <private/qquickitem_p.h> -#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl) +#if 0 // QTBUG-83976 # include <private/qquickopenglshadereffectnode_p.h> # include <private/qquickopenglshadereffect_p.h> # include <private/qquickshadereffect_p.h> @@ -431,9 +431,6 @@ void QQuickXAnimatorJob::writeBack() void QQuickXAnimatorJob::updateCurrentTime(int time) { -#if QT_CONFIG(opengl) - Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread()); -#endif if (!m_helper) return; @@ -450,9 +447,6 @@ void QQuickYAnimatorJob::writeBack() void QQuickYAnimatorJob::updateCurrentTime(int time) { -#if QT_CONFIG(opengl) - Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread()); -#endif if (!m_helper) return; @@ -469,9 +463,6 @@ void QQuickScaleAnimatorJob::writeBack() void QQuickScaleAnimatorJob::updateCurrentTime(int time) { -#if QT_CONFIG(opengl) - Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread()); -#endif if (!m_helper) return; @@ -492,9 +483,6 @@ extern QVariant _q_interpolateCounterclockwiseRotation(qreal &f, qreal &t, qreal void QQuickRotationAnimatorJob::updateCurrentTime(int time) { -#if QT_CONFIG(opengl) - Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread()); -#endif if (!m_helper) return; @@ -600,10 +588,6 @@ void QQuickOpacityAnimatorJob::writeBack() void QQuickOpacityAnimatorJob::updateCurrentTime(int time) { -#if QT_CONFIG(opengl) - Q_ASSERT(!m_controller || !m_controller->m_window->openglContext() || m_controller->m_window->openglContext()->thread() == QThread::currentThread()); -#endif - if (!m_opacityNode) return; @@ -612,7 +596,7 @@ void QQuickOpacityAnimatorJob::updateCurrentTime(int time) } -#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl) +#if 0 // QTBUG-83976 QQuickUniformAnimatorJob::QQuickUniformAnimatorJob() : m_node(nullptr) , m_uniformIndex(-1) |