From 99979159a404df09495c8ddd6a052837f66b8739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Fri, 7 Feb 2014 13:12:37 +0100 Subject: Fix linuxfb argument 'mmsize' parsing Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'. Task-number: QTBUG-29133 Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1 Reviewed-by: Laszlo Agocs --- src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp index 735a43daf7..33a9523568 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp @@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize() foreach (const QString &arg, mArgs) { if (arg == QLatin1String("nographicsmodeswitch")) doSwitchToGraphicsMode = false; + else if (mmSizeRx.indexIn(arg) != -1) + userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt()); else if (sizeRx.indexIn(arg) != -1) userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt())); else if (offsetRx.indexIn(arg) != -1) @@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize() ttyDevice = ttyRx.cap(1); else if (fbRx.indexIn(arg) != -1) fbDevice = fbRx.cap(1); - else if (mmSizeRx.indexIn(arg) != -1) - userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt()); } if (fbDevice.isEmpty()) { -- cgit v1.2.3 From b6b503fb6839de44530c4b88417f722c67570722 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 3 Feb 2014 16:14:53 +0100 Subject: Accessibility Win: handle disabled state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ChangeLog][QtGui] Windows Accessibility now handles the disabled state of widgets correctly. Task-number: QTBUG-36603 Change-Id: Ifebcf44320072089da66e81728de94e8f12a3354 Reviewed-by: Friedemann Kleint Reviewed-by: Jan Arve Sæther --- src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp index 8bb7646258..7c7c33616e 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp @@ -1027,6 +1027,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; -- cgit v1.2.3