diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 09:02:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 09:02:57 +0100 |
| commit | 6cb8121a44ee0f94f2c9fcb075d1d3c802d8c5c7 (patch) | |
| tree | 25822898b71068f820d25a9e8372dfb348190ec1 /src/opengl/qgl.cpp | |
| parent | 96740193e1e0f0608f67660811a44b696924ad4c (diff) | |
| parent | 2e02de165115c9d67ac343ff0960ed80f9c09bc8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/widgets/styles/qgtkstyle_p.cpp
tests/auto/corelib/io/qtextstream/test/test.pro
tests/auto/corelib/plugin/plugin.pro
Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b
Diffstat (limited to 'src/opengl/qgl.cpp')
0 files changed, 0 insertions, 0 deletions