diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:34:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:47:59 +0200 |
| commit | 8e67fb1f148b2f3c795d230faad7aee20389878a (patch) | |
| tree | 34358c0ee9ab4816d20d58d84bdab20093b1d423 /src/render/backend/renderview_p.h | |
| parent | ba5bc93b95d28a28a72e60281f765a6f031129a5 (diff) | |
| parent | d4fb24c0871320667640f100b743f34f702db6cf (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/animation/backend/channelmapper_p.h
Change-Id: I4e0f59c6648925ba45d30ccc2405524a9e901a0e
Diffstat (limited to 'src/render/backend/renderview_p.h')
| -rw-r--r-- | src/render/backend/renderview_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index bc68e2a63..8c733fc3a 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -342,6 +342,7 @@ private: ModelViewNormalMatrix, ViewportMatrix, InverseViewportMatrix, + AspectRatio, Time, Exposure, Gamma, |