AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xcb: Drop _QT_SETTINGS_TIMESTAMP_ atom

Browse Source 
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 <gatis.paeglis@qt.io>
This commit is contained in:
Alexander Volkov 2017-09-25 16:57:39 +03:00
parent a36031ace3
commit 5a868fe0bb
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -2024,10 +2024,7 @@ void QXcbConnection::initializeAllAtoms() {
++ptr; ++ptr;
} }
Q_ASSERT(i == QXcbAtom::NPredefinedAtoms); Q_ASSERT(i == QXcbAtom::NAtoms);
const QByteArray settings_atom_name = "_QT_SETTINGS_TIMESTAMP_" + m_displayName;
names[i++] = settings_atom_name;
xcb_intern_atom_cookie_t cookies[QXcbAtom::NAtoms]; xcb_intern_atom_cookie_t cookies[QXcbAtom::NAtoms];

3
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -302,9 +302,6 @@ namespace QXcbAtom {
_COMPIZ_TOOLKIT_ACTION, _COMPIZ_TOOLKIT_ACTION,
_GTK_LOAD_ICONTHEMES, _GTK_LOAD_ICONTHEMES,
NPredefinedAtoms,
_QT_SETTINGS_TIMESTAMP = NPredefinedAtoms,
NAtoms NAtoms
}; };
} }