From 5a868fe0bb8e1d1b02cb88afff3c258db4a2b1d7 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Mon, 25 Sep 2017 16:57:39 +0300 Subject: [PATCH] xcb: Drop _QT_SETTINGS_TIMESTAMP_ atom It was used in Qt 4 to make applications reload Trolltech.conf, which is not supported by Qt 5. Change-Id: Ic75c117f22a23a8f26b3f19ce57322878613f5b0 Reviewed-by: Gatis Paeglis --- src/plugins/platforms/xcb/qxcbconnection.cpp | 5 +---- src/plugins/platforms/xcb/qxcbconnection.h | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index c5eae20266..d6013541fc 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -2024,10 +2024,7 @@ void QXcbConnection::initializeAllAtoms() { ++ptr; } - Q_ASSERT(i == QXcbAtom::NPredefinedAtoms); - - const QByteArray settings_atom_name = "_QT_SETTINGS_TIMESTAMP_" + m_displayName; - names[i++] = settings_atom_name; + Q_ASSERT(i == QXcbAtom::NAtoms); xcb_intern_atom_cookie_t cookies[QXcbAtom::NAtoms]; diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 92825acb6d..98a009b211 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -302,9 +302,6 @@ namespace QXcbAtom { _COMPIZ_TOOLKIT_ACTION, _GTK_LOAD_ICONTHEMES, - NPredefinedAtoms, - - _QT_SETTINGS_TIMESTAMP = NPredefinedAtoms, NAtoms }; }