diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-05-06 16:39:44 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-06-22 19:50:42 +0000 |
| commit | 1acdcdaa4d9c4b6bf86b50ada8a7b194d86f1e4c (patch) | |
| tree | 900a2d33723992714d0c92000419b35ada9da36c /src/plugins/platforms/xcb/qxcbclipboard.cpp | |
| parent | 06af9a1e3891751d89a64e9013e204176c28ebdc (diff) | |
xcb: add static overload for setting window name
Change-Id: Ib581a582059e196567514f40b1964696ceaf3a88
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbclipboard.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbclipboard.cpp | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp index b091928e8c..70a413ebe1 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -42,6 +42,7 @@ #include "qxcbconnection.h" #include "qxcbscreen.h" #include "qxcbmime.h" +#include "qxcbwindow.h" #include <private/qguiapplication_p.h> #include <QElapsedTimer> @@ -276,18 +277,6 @@ QXcbClipboard::QXcbClipboard(QXcbConnection *c) m_timestamp[QClipboard::Selection] = XCB_CURRENT_TIME; m_owner = connection()->getQtSelectionOwner(); -#ifndef QT_NO_DEBUG - QByteArray ba("Qt clipboard window"); - xcb_change_property(xcb_connection(), - XCB_PROP_MODE_REPLACE, - m_owner, - atom(QXcbAtom::_NET_WM_NAME), - atom(QXcbAtom::UTF8_STRING), - 8, - ba.length(), - ba.constData()); -#endif - if (connection()->hasXFixes()) { const uint32_t mask = XCB_XFIXES_SELECTION_EVENT_MASK_SET_SELECTION_OWNER | XCB_XFIXES_SELECTION_EVENT_MASK_SELECTION_WINDOW_DESTROY | @@ -467,17 +456,9 @@ xcb_window_t QXcbClipboard::requestor() const platformScreen->screen()->root_visual, // visual 0, // value mask 0); // value list -#ifndef QT_NO_DEBUG - QByteArray ba("Qt clipboard requestor window"); - xcb_change_property(xcb_connection(), - XCB_PROP_MODE_REPLACE, - window, - atom(QXcbAtom::_NET_WM_NAME), - atom(QXcbAtom::UTF8_STRING), - 8, - ba.length(), - ba.constData()); -#endif + + QXcbWindow::setWindowTitle(connection(), window, + QStringLiteral("Qt Clipboard Requestor Window")); uint32_t mask = XCB_EVENT_MASK_PROPERTY_CHANGE; xcb_change_window_attributes(xcb_connection(), window, XCB_CW_EVENT_MASK, &mask); |