diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
| commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
| tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp | |
| parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
| parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp index d682ea87fb..5e406017ca 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp @@ -60,7 +60,7 @@ const xcb_visualtype_t *QXcbGlxWindow::createVisual() if (!scr) return nullptr; - qDebug(lcQpaGl) << "Requested format before FBConfig/Visual selection:" << m_format; + qCDebug(lcQpaGl) << "Requested format before FBConfig/Visual selection:" << m_format; Display *dpy = static_cast<Display *>(scr->connection()->xlib_display()); const char *glxExts = glXQueryExtensionsString(dpy, scr->screenNumber()); @@ -79,7 +79,7 @@ const xcb_visualtype_t *QXcbGlxWindow::createVisual() const xcb_visualtype_t *xcb_visualtype = scr->visualForId(visualInfo->visualid); XFree(visualInfo); - qDebug(lcQpaGl) << "Got format:" << m_format; + qCDebug(lcQpaGl) << "Got format:" << m_format; return xcb_visualtype; } |