diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2014-01-23 16:30:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-23 19:18:35 +0100 |
| commit | eeff8f7e7431eea6b6af4133413db2c610dfc123 (patch) | |
| tree | f4e152babeb6782d1db008f1b5d62259f4f0b716 /src/plugins/platforms/xcb/qxcbcursor.cpp | |
| parent | 614589d844921e351e5422ba4a9b55aac22566c5 (diff) | |
Silence failed xcbxsettings initialization
also add a boolean flag indicating if xsettings is initialized and can
be used
Change-Id: I9dae83b8fef224171744d2b940767cbf54ce4f55
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbcursor.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbcursor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp index 15e5bf27f1..ce9e445ba2 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -549,7 +549,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape) void *dpy = connection()->xlib_display(); // special case for non-standard dnd-* cursors cursor = loadCursor(dpy, cshape); - if (!cursor && !m_gtkCursorThemeInitialized) { + if (!cursor && !m_gtkCursorThemeInitialized && m_screen->xSettings()->initialized()) { QByteArray gtkCursorTheme = m_screen->xSettings()->setting("Gtk/CursorThemeName").toByteArray(); m_screen->xSettings()->registerCallbackForProperty("Gtk/CursorThemeName",cursorThemePropertyChanged,this); if (updateCursorTheme(dpy,gtkCursorTheme)) { |