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 | |
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')
-rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp | 4 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 6 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 |
3 files changed, 6 insertions, 6 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; } diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 6afa7bc934..471287eb44 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -176,8 +176,8 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters, int &argc, char #if defined(QT_DEBUG) if (!noGrabArg && !doGrabArg && underDebugger) { - qDebug("Qt: gdb: -nograb added to command-line options.\n" - "\t Use the -dograb option to enforce grabbing."); + qCDebug(lcQpaXcb, "Qt: gdb: -nograb added to command-line options.\n" + "\t Use the -dograb option to enforce grabbing."); } #endif m_canGrab = (!underDebugger && !noGrabArg) || (underDebugger && doGrabArg); @@ -213,7 +213,7 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters, int &argc, char #if QT_CONFIG(xcb_native_painting) if (nativePaintingEnabled()) { - qDebug("QXCB USING NATIVE PAINTING"); + qCDebug(lcQpaXcb, "QXCB USING NATIVE PAINTING"); qt_xcb_native_x11_info_init(defaultConnection()); } #endif diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 20d030b5c9..46698de158 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -226,7 +226,7 @@ static inline XTextProperty* qstringToXTP(Display *dpy, const QString& s) tl[1] = 0; errCode = XmbTextListToTextProperty(dpy, tl, 1, XStdICCTextStyle, &tp); if (errCode < 0) - qDebug("XmbTextListToTextProperty result code %d", errCode); + qCDebug(lcQpaXcb, "XmbTextListToTextProperty result code %d", errCode); } if (!mapper || errCode < 0) { mapper = QTextCodec::codecForName("latin1"); |