diff --git a/src/plugins/platforms/xcb/qxcbatom.cpp b/src/plugins/platforms/xcb/qxcbatom.cpp
index 6cb6d29de24..09b1fe8a9d0 100644
--- a/src/plugins/platforms/xcb/qxcbatom.cpp
+++ b/src/plugins/platforms/xcb/qxcbatom.cpp
@@ -215,25 +215,19 @@ void QXcbAtom::initialize(xcb_connection_t *connection)
 }
 
 void QXcbAtom::initializeAllAtoms(xcb_connection_t *connection) {
-    const char *names[QXcbAtom::NAtoms];
-    const char *ptr = xcb_atomnames;
-
+    const char *name = xcb_atomnames;
+    size_t name_len;
     int i = 0;
-    while (*ptr) {
-        names[i++] = ptr;
-        while (*ptr)
-            ++ptr;
-        ++ptr;
+    xcb_intern_atom_cookie_t cookies[QXcbAtom::NAtoms];
+
+    while ((name_len = strlen(name)) != 0) {
+        cookies[i] = xcb_intern_atom(connection, false, name_len, name);
+        ++i;
+        name += name_len + 1; // jump over the \0
     }
 
     Q_ASSERT(i == QXcbAtom::NAtoms);
 
-    xcb_intern_atom_cookie_t cookies[QXcbAtom::NAtoms];
-
-    Q_ASSERT(i == QXcbAtom::NAtoms);
-    for (i = 0; i < QXcbAtom::NAtoms; ++i)
-        cookies[i] = xcb_intern_atom(connection, false, strlen(names[i]), names[i]);
-
     for (i = 0; i < QXcbAtom::NAtoms; ++i) {
         xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, cookies[i], nullptr);
         m_allAtoms[i] = reply->atom;