diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-03-23 15:39:36 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-03-23 15:39:36 +0100 |
| commit | 4d6e3ba98a09ffb390da90154a2f61085b565d8e (patch) | |
| tree | 3bc5e33dde21653934875ac9d48e037fe3e309ad /src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h | |
| parent | 70ceffff9c008d467f6ce352b89f13f5cc6f45a6 (diff) | |
| parent | 861e372b6ad81570d4f496e42fb25a6699b72f2f (diff) | |
| download | qtlocation-4d6e3ba98a09ffb390da90154a2f61085b565d8e.tar.gz | |
Merge branch '5.15' into dev
Task-number: QTBUG-91623
Change-Id: I3218a516d4ecb0030a14c692c7d3d94d5833c3fa
Diffstat (limited to 'src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h index 22a69173..705ccf5a 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h @@ -395,7 +395,7 @@ public: "}"; } - const char *fragmentShader() const { + const char *fragmentShader() const override { return "uniform lowp vec4 color; \n" "void main() { \n" |