diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-06-28 13:52:51 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-06-28 15:20:02 +0000 |
commit | fb0271564d8e0098b12689ed044c8615c3a67473 (patch) | |
tree | ea7397d3088ce701edae00506904a1c1ae5924cb | |
parent | 3d17542cde70df0ba5df06c57538c7b6877b6c72 (diff) |
Fix wrongly included radial gradient enum for QGradient presets
Change-Id: If8372224d7e113c1f55468c0de69dcab9804138f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/gui/painting/qbrush.h | 3 | ||||
-rwxr-xr-x | util/gradientgen/gradientgen.js | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h index b43a732c86..aee51c526d 100644 --- a/src/gui/painting/qbrush.h +++ b/src/gui/painting/qbrush.h @@ -231,7 +231,6 @@ public: NearMoon = 24, WildApple = 25, SaintPetersburg = 26, - AriellesSmile = 27, PlumPlate = 28, EverlastingSky = 29, HappyFisher = 30, @@ -373,7 +372,7 @@ public: FrozenHeat = 177, GagarinView = 178, FabledSunset = 179, - PerfectBlue = 180 + PerfectBlue = 180, }; Q_ENUM(Preset) diff --git a/util/gradientgen/gradientgen.js b/util/gradientgen/gradientgen.js index 2c0539c759..434f05b2bb 100755 --- a/util/gradientgen/gradientgen.js +++ b/util/gradientgen/gradientgen.js @@ -113,13 +113,16 @@ fs.readFile(filename, (err, css) => { }); gradients[gradients.length - 1] = { start, end, stops }; - if (mode == 'debug') - console.log(name, args, gradients[gradients.length - 1]) }); + if (!gradients[gradients.length - 1]) + return; // Not supported + enums.push(name); - if (mode == 'enums') + if (mode == 'debug') + console.log(name, args, gradients[gradients.length - 1]) + else if (mode == 'enums') console.log(`${name} = ${gradients.length},`) }); |