diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-11 10:27:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-25 10:06:43 +0000 |
| commit | 4f599c5ea180f5246adf2a95c158b50f027a8c21 (patch) | |
| tree | 9755d632ef6d556dcb34399019a9c77cf0b89eea /src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h | |
| parent | a06148e3414744cc4153f40a5610bad53ffebd62 (diff) | |
Enable IAccessible2 for MinGW
MinGW 5.3 is able to compile the IAccessible2 classes. All that is needed
is some way to provide the missing IIDs, which is done via specialization
of a function template (similar to the MinGW's __uuidof operator).
[ChangeLog][Windows][Accessibility] MinGW builds now support IAccessible2.
Change-Id: I218a4b89c81b54aa96f7c743544388631ca9a53e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h')
| -rw-r--r-- | src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h index 07f10da99a..e654f262da 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h +++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h @@ -46,14 +46,8 @@ #include <QtCore/qt_windows.h> #include <QtCore/qsharedpointer.h> #include <QtGui/qaccessible.h> -#ifndef Q_CC_MINGW -# include <oleacc.h> -# include "ia2_api_all.h" // IAccessible2 inherits from IAccessible -#else - // MinGW -# include <basetyps.h> -# include <oleacc.h> -#endif +#include <oleacc.h> +#include "ia2_api_all.h" // IAccessible2 inherits from IAccessible QT_BEGIN_NAMESPACE @@ -88,13 +82,7 @@ QDebug operator<<(QDebug d, const QWindowsAccessibleGuid &aguid); * QWindowsAccessible * **************************************************************/ -#ifndef Q_CC_MINGW -typedef IAccessible2 AccessibleBase; -#else -typedef IAccessible AccessibleBase; -#endif - -class QWindowsMsaaAccessible : public AccessibleBase, public IOleWindow +class QWindowsMsaaAccessible : public IAccessible2, public IOleWindow { public: QWindowsMsaaAccessible(QAccessibleInterface *a) |