Don't access null pointer

Change-Id: If9ac712543f7c7fd85d877bba76e67ce89c60c61
Reviewed-by: Michael Brasser <michael.brasser@live.com>
bb10
Gatis Paeglis 2014-04-03 17:03:36 +02:00 committed by The Qt Project
parent 5fe98ebb37
commit c2b2ef32ca
1 changed files with 6 additions and 3 deletions

View File

@ -665,9 +665,12 @@ void QXcbKeyboard::clearXKBConfig()
void QXcbKeyboard::printKeymapError(const char *error) const
{
qWarning() << error << "Current XKB configuration data search paths are: ";
for (unsigned int i = 0; i < xkb_context_num_include_paths(xkb_context); ++i)
qWarning() << xkb_context_include_path_get(xkb_context, i);
qWarning() << error;
if (xkb_context) {
qWarning() << "Current XKB configuration data search paths are: ";
for (unsigned int i = 0; i < xkb_context_num_include_paths(xkb_context); ++i)
qWarning() << xkb_context_include_path_get(xkb_context, i);
}
qWarning() << "Use QT_XKB_CONFIG_ROOT environmental variable to provide an additional search path, "
"add ':' as separator to provide several search paths and/or make sure that XKB configuration data "
"directory contains recent enough contents, to update please see http://cgit.freedesktop.org/xkeyboard-config/ .";