diff options
Diffstat (limited to 'src/plugins')
7 files changed, 16 insertions, 19 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index 7cd47f3fec..7d3668ee5a 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -1069,7 +1069,6 @@ QString QAccessibleTableCell::text(QAccessible::Text t) const QAbstractItemModel *model = view->model(); QString value; switch (t) { - case QAccessible::Value: case QAccessible::Name: value = model->data(m_index, Qt::AccessibleTextRole).toString(); if (value.isEmpty()) @@ -1161,7 +1160,6 @@ QString QAccessibleTableHeaderCell::text(QAccessible::Text t) const QAbstractItemModel *model = view->model(); QString value; switch (t) { - case QAccessible::Value: case QAccessible::Name: value = model->headerData(index, orientation, Qt::AccessibleTextRole).toString(); if (value.isEmpty()) diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index 79a5c82fe0..71d22eabc4 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -631,7 +631,7 @@ QDockWidget *QAccessibleDockWidget::dockWidget() const QString QAccessibleDockWidget::text(QAccessible::Text t) const { - if (t == QAccessible::Name || t == QAccessible::Value) { + if (t == QAccessible::Name) { return qt_accStripAmp(dockWidget()->windowTitle()); } return QString(); diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index c275ec071d..893be2df04 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -507,8 +507,10 @@ QString QAccessibleGroupBox::text(QAccessible::Text t) const switch (t) { case QAccessible::Name: txt = qt_accStripAmp(groupBox()->title()); + break; case QAccessible::Description: - txt = qt_accStripAmp(groupBox()->title()); + txt = qt_accStripAmp(groupBox()->toolTip()); + break; default: break; } diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp index 773939b485..9905d9cc9e 100644 --- a/src/plugins/generic/tslib/qtslib.cpp +++ b/src/plugins/generic/tslib/qtslib.cpp @@ -48,8 +48,6 @@ #include <QPoint> #include <qpa/qwindowsysteminterface.h> -#include <Qt> - #include <errno.h> #include <tslib.h> @@ -65,21 +63,21 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, setObjectName(QLatin1String("TSLib Mouse Handler")); QByteArray device = qgetenv("TSLIB_TSDEVICE"); - if (device.isEmpty()) - device = QByteArrayLiteral("/dev/input/event1"); if (specification.startsWith("/dev/")) device = specification.toLocal8Bit(); + if (device.isEmpty()) + device = QByteArrayLiteral("/dev/input/event1"); + m_dev = ts_open(device.constData(), 1); if (!m_dev) { qErrnoWarning(errno, "ts_open() failed"); return; } - if (ts_config(m_dev)) { + if (ts_config(m_dev)) perror("Error configuring\n"); - } m_rawMode = !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive); @@ -89,7 +87,6 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData())); } else { qWarning("Cannot open mouse input device '%s': %s", device.constData(), strerror(errno)); - return; } } @@ -103,12 +100,10 @@ QTsLibMouseHandler::~QTsLibMouseHandler() static bool get_sample(struct tsdev *dev, struct ts_sample *sample, bool rawMode) { - if (rawMode) { + if (rawMode) return (ts_read_raw(dev, sample, 1) == 1); - } else { - int ret = ts_read(dev, sample, 1); - return ( ret == 1); - } + else + return (ts_read(dev, sample, 1) == 1); } diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index 121e734ec1..e2810c8448 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -347,7 +347,7 @@ ushort TableGenerator::keysymToUtf8(quint32 sym) qDebug() << QString("keysym - 0x%1 : utf8 - %2").arg(QString::number(sym, 16)) .arg(codec->toUnicode(chars)); #endif - return QString::fromLocal8Bit(chars).at(0).unicode(); + return QString::fromUtf8(chars).at(0).unicode(); } static inline int fromBase8(const char *s, const char *end) diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp index c0691a38fc..5af84918d9 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp @@ -335,6 +335,8 @@ bool QLinuxFbScreen::initialize() QRegularExpressionMatch match; if (arg == QLatin1String("nographicsmodeswitch")) doSwitchToGraphicsMode = false; + else if (arg.contains(mmSizeRx, &match)) + userMmSize = QSize(match.captured(1).toInt(), match.captured(2).toInt()); else if (arg.contains(sizeRx, &match)) userGeometry.setSize(QSize(match.captured(1).toInt(), match.captured(2).toInt())); else if (arg.contains(offsetRx, &match)) @@ -343,8 +345,6 @@ bool QLinuxFbScreen::initialize() ttyDevice = match.captured(1); else if (arg.contains(fbRx, &match)) fbDevice = match.captured(1); - else if (arg.contains(mmSizeRx, &match)) - userMmSize = QSize(match.captured(1).toInt(), match.captured(2).toInt()); } if (fbDevice.isEmpty()) { diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp index 49d4a712d8..bda806d102 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp @@ -1012,6 +1012,8 @@ HRESULT STDMETHODCALLTYPE QWindowsMsaaAccessible::get_accState(VARIANT varID, VA st |= STATE_SYSTEM_SIZEABLE; if (state.traversed) st |= STATE_SYSTEM_TRAVERSED; + if (state.disabled) + st |= STATE_SYSTEM_UNAVAILABLE; (*pvarState).vt = VT_I4; (*pvarState).lVal = st; |