diff options
Diffstat (limited to 'examples/quick/quickwidgets')
| -rw-r--r-- | examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp | 4 | ||||
| -rw-r--r-- | examples/quick/quickwidgets/quickwidget/main.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp index c5924bf159..49c4450b89 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp +++ b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.cpp @@ -263,8 +263,8 @@ static const char *fragmentShaderSource = void FbItemRenderer::initProgram() { m_program.reset(new QOpenGLShaderProgram); - m_program->addShaderFromSourceCode(QOpenGLShader::Vertex, vertexShaderSource); - m_program->addShaderFromSourceCode(QOpenGLShader::Fragment, fragmentShaderSource); + m_program->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexShaderSource); + m_program->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragmentShaderSource); m_program->bindAttributeLocation("vertex", 0); m_program->bindAttributeLocation("normal", 1); m_program->link(); diff --git a/examples/quick/quickwidgets/quickwidget/main.cpp b/examples/quick/quickwidgets/quickwidget/main.cpp index 6bb6722e02..7cb35d7bcd 100644 --- a/examples/quick/quickwidgets/quickwidget/main.cpp +++ b/examples/quick/quickwidgets/quickwidget/main.cpp @@ -133,7 +133,8 @@ void MainWindow::quickWidgetStatusChanged(QQuickWidget::Status status) { if (status == QQuickWidget::Error) { QStringList errors; - foreach (const QQmlError &error, m_quickWidget->errors()) + const auto widgetErrors = m_quickWidget->errors(); + for (const QQmlError &error : widgetErrors) errors.append(error.toString()); statusBar()->showMessage(errors.join(QStringLiteral(", "))); } |