diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 10:11:17 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 10:11:57 +0200 |
| commit | 6881e1613af3e31ca3cd6b297e7756bb61d2f038 (patch) | |
| tree | 5398aaf4536d6c3f93869cf671ee0dbc42072ae1 /examples/widgets | |
| parent | 3ae34b7ead938dc716e2fad2fa686d6867466255 (diff) | |
| parent | 7f80c96432270e0097883e11e632c14cba68da28 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I172e3e19ddcc5b7665e6c8382d725e7cc4f9794f
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/graphicsview/boxes/3rdparty/fbm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/graphicsview/boxes/3rdparty/fbm.c b/examples/widgets/graphicsview/boxes/3rdparty/fbm.c index 98eb87a33b..3eebaabfba 100644 --- a/examples/widgets/graphicsview/boxes/3rdparty/fbm.c +++ b/examples/widgets/graphicsview/boxes/3rdparty/fbm.c @@ -106,7 +106,7 @@ float noise3(float vec[3]) { int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11; float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v; - register int i, j; + int i, j; if (start) { start = 0; |