From b2a7d865b2660d83fa899a213826525788d66b95 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Thu, 7 Aug 2014 10:51:30 +0200
Subject: Update IAccessible2 to 1.3.0

In addition change to the one in all file instead of individual
interfaces. Future updates only have to copy the new version of
ia2_api_all.idl and run nmake.

Change-Id: Ie7a1e65c8dd0c73809ac97aae2d586f425337f18
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
---
 src/3rdparty/iaccessible2/iaccessible2.pri | 74 ++----------------------------
 1 file changed, 4 insertions(+), 70 deletions(-)

(limited to 'src/3rdparty/iaccessible2/iaccessible2.pri')

diff --git a/src/3rdparty/iaccessible2/iaccessible2.pri b/src/3rdparty/iaccessible2/iaccessible2.pri
index b3cdfa9356..c7daa760c6 100644
--- a/src/3rdparty/iaccessible2/iaccessible2.pri
+++ b/src/3rdparty/iaccessible2/iaccessible2.pri
@@ -10,84 +10,18 @@ MIDL_GENERATED = $$PWD/generated/$${ARCH_SUBDIR}
 
 INCLUDEPATH += $$MIDL_GENERATED
 
-SOURCES +=  $${MIDL_GENERATED}/Accessible2_p.c \
-            $${MIDL_GENERATED}/AccessibleAction_p.c \
-            $${MIDL_GENERATED}/AccessibleApplication_p.c \
-            $${MIDL_GENERATED}/AccessibleComponent_p.c \
-            $${MIDL_GENERATED}/AccessibleEditableText_p.c \
-            $${MIDL_GENERATED}/AccessibleHyperlink_p.c \
-            $${MIDL_GENERATED}/AccessibleHypertext_p.c \
-            $${MIDL_GENERATED}/AccessibleImage_p.c \
-            $${MIDL_GENERATED}/AccessibleRelation_p.c \
-            $${MIDL_GENERATED}/AccessibleTable2_p.c \
-            $${MIDL_GENERATED}/AccessibleTableCell_p.c \
-            $${MIDL_GENERATED}/AccessibleTable_p.c \
-            $${MIDL_GENERATED}/AccessibleText_p.c \
-            $${MIDL_GENERATED}/AccessibleValue_p.c
-
-SOURCES +=  $${MIDL_GENERATED}/Accessible2_i.c \
-            $${MIDL_GENERATED}/AccessibleAction_i.c \
-            $${MIDL_GENERATED}/AccessibleApplication_i.c \
-            $${MIDL_GENERATED}/AccessibleComponent_i.c \
-            $${MIDL_GENERATED}/AccessibleEditableText_i.c \
-            $${MIDL_GENERATED}/AccessibleHyperlink_i.c \
-            $${MIDL_GENERATED}/AccessibleHypertext_i.c \
-            $${MIDL_GENERATED}/AccessibleImage_i.c \
-            $${MIDL_GENERATED}/AccessibleRelation_i.c \
-            $${MIDL_GENERATED}/AccessibleTable2_i.c \
-            $${MIDL_GENERATED}/AccessibleTableCell_i.c \
-            $${MIDL_GENERATED}/AccessibleTable_i.c \
-            $${MIDL_GENERATED}/AccessibleText_i.c \
-            $${MIDL_GENERATED}/AccessibleValue_i.c
-
-SOURCES +=  $${MIDL_GENERATED}/IA2TypeLibrary_i.c
+SOURCES +=  $${MIDL_GENERATED}/ia2_api_all_i.c \
+            $${MIDL_GENERATED}/ia2_api_all_p.c
 
 # Do not add dlldata.c when building accessibility into a static library, as the COM entry points
 # defined there can cause duplicate symbol errors when linking into a binary that also defines
 # such entry points, e.g. anything linked against QtAxServer.
 !static: SOURCES += $${MIDL_GENERATED}/dlldata.c
 
-HEADERS +=  $${MIDL_GENERATED}/Accessible2.h \
-            $${MIDL_GENERATED}/AccessibleAction.h \
-            $${MIDL_GENERATED}/AccessibleApplication.h \
-            $${MIDL_GENERATED}/AccessibleComponent.h \
-            $${MIDL_GENERATED}/AccessibleEditableText.h \
-            $${MIDL_GENERATED}/AccessibleEventID.h \
-            $${MIDL_GENERATED}/AccessibleHyperlink.h \
-            $${MIDL_GENERATED}/AccessibleHypertext.h \
-            $${MIDL_GENERATED}/AccessibleImage.h \
-            $${MIDL_GENERATED}/AccessibleRelation.h \
-            $${MIDL_GENERATED}/AccessibleRole.h \
-            $${MIDL_GENERATED}/AccessibleStates.h \
-            $${MIDL_GENERATED}/AccessibleTable.h \
-            $${MIDL_GENERATED}/AccessibleTable2.h \
-            $${MIDL_GENERATED}/AccessibleTableCell.h \
-            $${MIDL_GENERATED}/AccessibleText.h \
-            $${MIDL_GENERATED}/AccessibleValue.h \
-            $${MIDL_GENERATED}/IA2CommonTypes.h \
-            $${MIDL_GENERATED}/IA2TypeLibrary.h
-
+HEADERS +=  $${MIDL_GENERATED}/ia2_api_all.h
 
 OTHER_FILES = \
-    $$PWD/idl/Accessible2.idl \
-    $$PWD/idl/AccessibleAction.idl \
-    $$PWD/idl/AccessibleApplication.idl \
-    $$PWD/idl/AccessibleComponent.idl \
-    $$PWD/idl/AccessibleEditableText.idl \
-    $$PWD/idl/AccessibleEventID.idl \
-    $$PWD/idl/AccessibleHyperlink.idl \
-    $$PWD/idl/AccessibleHypertext.idl \
-    $$PWD/idl/AccessibleImage.idl \
-    $$PWD/idl/AccessibleRelation.idl \
-    $$PWD/idl/AccessibleRole.idl \
-    $$PWD/idl/AccessibleStates.idl \
-    $$PWD/idl/AccessibleTable.idl \
-    $$PWD/idl/AccessibleTable2.idl \
-    $$PWD/idl/AccessibleTableCell.idl \
-    $$PWD/idl/AccessibleText.idl \
-    $$PWD/idl/AccessibleValue.idl \
-    $$PWD/idl/IA2CommonTypes.idl \
-    $$PWD/idl/IA2TypeLibrary.idl
+    $$PWD/idl/ia2_api_all.idl
 
 LIBS += -lrpcrt4
 
-- 
cgit v1.2.3