diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-21 08:59:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-21 08:59:26 +0100 |
| commit | cc920b4cddc170a7442d8fdfb53076c208a3d71e (patch) | |
| tree | e4757cffe420bd3c61dda1d369b452a0fac9eff7 /src/gui/opengl/qopenglshaderprogram.cpp | |
| parent | c8c8cc790a315710b0dae2282dc32e3472e107ee (diff) | |
| parent | fc8fd508165c8e4dcfe0da397b63cf99f15178e3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I35a6555e3885e489f88aa9b4b0142e1017f7a959
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index 46963f0dbf..6d7aecac6f 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -46,7 +46,6 @@ #include <QtCore/qfile.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qvector.h> -#include <QtCore/qregularexpression.h> #include <QtCore/qloggingcategory.h> #include <QtCore/qcryptographichash.h> #include <QtCore/qcoreapplication.h> |