diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
| commit | 7344987c20d13710af89300f9b39e06397ec592a (patch) | |
| tree | 4c12e46adefd3aee9d2ce479923fe56bab483764 /tests/auto/opengl/qgl | |
| parent | 8ad5967793f43bda2c38e3f9dddd3d2b6fef5390 (diff) | |
| parent | 29208fa07c1b9f656ea2535696828385b7832226 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad
Diffstat (limited to 'tests/auto/opengl/qgl')
| -rw-r--r-- | tests/auto/opengl/qgl/BLACKLIST | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/opengl/qgl/BLACKLIST b/tests/auto/opengl/qgl/BLACKLIST index 1eb0197484..d3165a51e5 100644 --- a/tests/auto/opengl/qgl/BLACKLIST +++ b/tests/auto/opengl/qgl/BLACKLIST @@ -19,7 +19,7 @@ winrt [graphicsViewClipping] windows winrt -rhel-7.4 ci +linux ci [glFBOUseInGLWidget] windows winrt |