diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-12 14:14:02 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-14 15:52:58 +0200 |
| commit | 6f0df02d002356625f10683ef84da7685d92a2c4 (patch) | |
| tree | 46713209af459ebda534c3404f48c5f5c80ba3f8 /src/opengl/qopenglshaderprogram.cpp | |
| parent | 44cce1a2ea9dadd8b2de93f40de34269dda703c0 (diff) | |
Replace Qt CONSTEXPR defines with constexpr
Both normal and relaxed constexpr are required by our new minimum of C++17. Change-Id: Ic028b88a2e7a6cb7d5925f3133b9d54859a81744 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/opengl/qopenglshaderprogram.cpp')
| -rw-r--r-- | src/opengl/qopenglshaderprogram.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp index e23909961cd..da3ff392efa 100644 --- a/src/opengl/qopenglshaderprogram.cpp +++ b/src/opengl/qopenglshaderprogram.cpp @@ -489,13 +489,13 @@ static const char blendEquationAdvancedHeader[] = struct QVersionDirectivePosition { - Q_DECL_CONSTEXPR QVersionDirectivePosition(int position = 0, int line = -1) + constexpr QVersionDirectivePosition(int position = 0, int line = -1) : position(position) , line(line) { } - Q_DECL_CONSTEXPR bool hasPosition() const + constexpr bool hasPosition() const { return position > 0; } |
