1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warnings

Browse Source 
Change-Id: I499c50c901bff1c496b05b628f8155376b5af267
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Jorgen Lind 2013-11-22 16:54:54 +01:00 committed by The Qt Project
parent e6f5c22e4e
commit e36edb655f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -108,7 +108,7 @@ void QWaylandDataDevice::cancelDrag()
void QWaylandDataDevice::data_device_data_offer(struct ::wl_data_offer *id)
{
QWaylandDataOffer *offer = new QWaylandDataOffer(m_display, id);
new QWaylandDataOffer(m_display, id);
}
void QWaylandDataDevice::data_device_drop()

2
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -230,7 +230,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
mTouchExtension = new QWaylandTouchExtension(this, id);
} else if (interface == QStringLiteral("qt_key_extension")) {
mQtKeyExtension = new QWaylandQtKeyExtension(this, id);
} else if (interface == "wl_text_input_manager") {
} else if (interface == QStringLiteral("wl_text_input_manager")) {
mTextInputManager = new QtWayland::wl_text_input_manager(registry, id);
}

5
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -126,6 +126,7 @@ void QWaylandTextInput::updateState()
void QWaylandTextInput::text_input_commit_string(uint32_t serial, const QString &text)
{
Q_UNUSED(serial);
if (!QGuiApplication::focusObject())
return;
@ -146,6 +147,9 @@ void QWaylandTextInput::text_input_leave()
void QWaylandTextInput::text_input_keysym(uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers)
{
Q_UNUSED(serial);
Q_UNUSED(time);
Q_UNUSED(modifiers);
if (!QGuiApplication::focusObject())
return;
@ -191,6 +195,7 @@ void QWaylandInputContext::commit()
void QWaylandInputContext::update(Qt::InputMethodQueries queries)
{
Q_UNUSED(queries);
if (!ensureTextInput())
return;