summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-11-01 21:16:01 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-11-26 07:09:11 +0000
commit4f46ccc4517a52b152d36e7734c2042e06ea8de3 (patch)
treef145dd9068c17c5c1fbc0084ada3e464e40b9f4d
parent00cd8b93de47b97878422c3392412d2aa0dbbed5 (diff)
Fix GCC warning about assignment in an if
renderer.cpp:449:48: error: suggest parentheses around assignment used as truth value [-Werror=parentheses] Change-Id: Ic46ff326a6ba46bc877cfffd14831fe2a9371bed Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/backend/renderer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 1c37266d4..4176cdbb2 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -456,7 +456,8 @@ void Renderer::doRender()
{ // Scoped to destroy surfaceLock
QSurface *surface = nullptr;
for (const Render::RenderView *rv: renderViews) {
- if (surface = rv->surface())
+ surface = rv->surface();
+ if (surface)
break;
}
@@ -902,7 +903,8 @@ Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<Ren
QSurface *surface = nullptr;
QSurface *previousSurface = nullptr;
for (const Render::RenderView *rv: renderViews) {
- if (previousSurface = rv->surface())
+ previousSurface = rv->surface();
+ if (previousSurface)
break;
}
QSurface *lastUsedSurface = nullptr;