diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:19:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:38:25 +0100 |
| commit | c97eb3e18ec0326a469ef37997f6368cf029c766 (patch) | |
| tree | be89410d14c1042f469257f0bdb6448027231413 /src/opengl | |
| parent | e39a9de3309f84be4101da839a0bacf69090706f (diff) | |
| parent | 1d9547c9a4b58cadc1105521df27e40ff5945259 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qrandom.cpp
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
Change-Id: Icc10543a1f2db5d640d01796bfec70a63517a6b2
Diffstat (limited to 'src/opengl')
0 files changed, 0 insertions, 0 deletions