summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qguiapplication.cpp
diff options
context:
space:
mode:
authorRick Stockton <rickstockton@reno-computerhelp.com>2011-11-09 21:02:18 -0800
committerQt by Nokia <qt-info@nokia.com>2011-11-14 18:41:17 +0100
commita329fc574b4f413050fa0210915af2ac97708d0a (patch)
treec39f87c917ae7a4a632dd28b5d18419ab33b8a57 /src/gui/kernel/qguiapplication.cpp
parentbeaf6b16a942904c368da9dad98d3e44136e6928 (diff)
Support 31 mouse buttons (with platform plugins xcb and xlib).
This commit includes changes for mouse button support within the XCB and XLIB platform plugins. Support in other platform plugins will be added in the future. The namespace update is prerequisite to compile the the Plugins, and the update in qguiapplication.cpp is required for the enhancements to actually work. Task-number: QTBUG-22642 Change-Id: Ie18fca3b9c86d0b6abbf2103a4f8582e6ce83e7d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
-rw-r--r--src/gui/kernel/qguiapplication.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 07e9489ddc..b1abe659e4 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -316,7 +316,7 @@ static void init_plugins(const QList<QByteArray> &pluginList)
else
plugin = QGenericPluginFactory::create(QLatin1String(pluginSpec.mid(0, colonPos)),
QLatin1String(pluginSpec.mid(colonPos+1)));
- qDebug() << " created" << plugin;
+ qDebug() << " created" << plugin;
if (plugin)
QGuiApplicationPrivate::generic_plugin_list.append(plugin);
}
@@ -618,9 +618,9 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
qAbs(globalPoint.y() - mousePressY) > mouse_double_click_distance)
mousePressButton = Qt::NoButton;
}
- else { // check to see if a new button has been pressed/released
+ else { // Check to see if a new button has been pressed/released.
for (int check = Qt::LeftButton;
- check <= Qt::XButton2;
+ check <= Qt::MaxMouseButton;
check = check << 1) {
if (check & stateChange) {
button = Qt::MouseButton(check);
@@ -628,7 +628,7 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
}
}
if (button == Qt::NoButton) {
- // Ignore mouse events that don't change the current state
+ // Ignore mouse events that don't change the current state.
return;
}
buttons = e->buttons;