diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:59 +0200 |
| commit | 1190863fc0855ef25e7239e35da3978f317638bd (patch) | |
| tree | 92c408f7c53f194639d2a10b82f5c90a85704776 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
| parent | 02afd94ef4c1913735bd650ca93279cfb00dc534 (diff) | |
| parent | e4484bb15b29b01dba07cbc31c150153f537606a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index ca7896995f..b94ca20458 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1397,7 +1397,7 @@ static const char * xcb_atomnames = { #if XCB_USE_MAEMO_WINDOW_PROPERTIES "_MEEGOTOUCH_ORIENTATION_ANGLE\0" #endif - "_XSETTINGS_SETTINGS" + "_XSETTINGS_SETTINGS\0" // \0\0 terminates loop. }; xcb_atom_t QXcbConnection::atom(QXcbAtom::Atom atom) const |