Merge remote-tracking branch 'origin/release' into stable

Manually fixed up: isES -> isOpenGLES
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5

1 files changed, 2 insertions, 1 deletions

diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 5c73705d4c..0eed6ea4d3 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -448,9 +448,10 @@ bool QSqlTableModel::selectRow(int row)
             // Look for changed values. Primary key fields are customarily first
             // and probably change less often than other fields, so start at the end.
             for (int f = curValues.count() - 1; f >= 0; --f) {
-                if (curValues.value(f) != newValues.value(f))
+                if (curValues.value(f) != newValues.value(f)) {
                     needsAddingToCache = true;
                     break;
+                }
             }
         }
     }