diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
commit | 0bf14044178d7aa212ac7e28530f9077790a3df4 (patch) | |
tree | 4c403571abbc5e18c6962ba67d9cb584d8e121c4 /src/quick/scenegraph/qsgcontext.cpp | |
parent | 0aea009425242417bffdb171c8eca02ff52f4a7b (diff) | |
parent | 79cfc8788d6267eeb263983466ba21758f618dcd (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I241cd418bb7e7b95e0a0a2ee4c465d48be2a5582
Diffstat (limited to 'src/quick/scenegraph/qsgcontext.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 25945ad78a..395353f30d 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -631,12 +631,12 @@ void QSGRenderContext::initialize(QOpenGLContext *context) #ifdef Q_OS_LINUX const char *vendor = (const char *) funcs->glGetString(GL_VENDOR); - if (strstr(vendor, "nouveau")) + if (vendor && strstr(vendor, "nouveau")) m_brokenIBOs = true; const char *renderer = (const char *) funcs->glGetString(GL_RENDERER); - if (strstr(renderer, "llvmpipe")) + if (renderer && strstr(renderer, "llvmpipe")) m_serializedRender = true; - if (strstr(vendor, "Hisilicon Technologies") && strstr(renderer, "Immersion.16")) + if (vendor && renderer && strstr(vendor, "Hisilicon Technologies") && strstr(renderer, "Immersion.16")) m_brokenIBOs = true; #endif |