Do not compile in dlldata.c or ia2_api_all_c.c

These files are only required for a COM server, but since the
IAccessible2Proxy will actually be the effective server (inside our
process). We just have to make sure we respond to the correct events, and
reimplement the virtual functions as required.
This is already done, so these files can be removed.

Task-number: QTBUG-30838
Task-number: QTBUG-28645
Change-Id: Ic95101945bad263a6da63c08b3e47cc0c9d5734a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
This commit is contained in:
Jan Arve Saether 2015-01-26 16:56:34 +01:00 committed by Jan Arve Sæther
parent 37e7c3afbc
commit 3f431e279a
8 changed files with 5 additions and 15781 deletions

View File

@ -1,38 +0,0 @@
/*********************************************************
DllData file -- generated by MIDL compiler
DO NOT ALTER THIS FILE
This file is regenerated by MIDL on every IDL file compile.
To completely reconstruct this file, delete it and rerun MIDL
on all the IDL files in this DLL, specifying this file for the
/dlldata command line option
*********************************************************/
#define PROXY_DELEGATION
#include <rpcproxy.h>
#ifdef __cplusplus
extern "C" {
#endif
EXTERN_PROXY_FILE( ia2_api_all )
PROXYFILE_LIST_START
/* Start of list */
REFERENCE_PROXY_FILE( ia2_api_all ),
/* End of list */
PROXYFILE_LIST_END
DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
#ifdef __cplusplus
} /*extern "C" */
#endif
/* end of generated dlldata file */

File diff suppressed because it is too large Load Diff

View File

@ -1,38 +0,0 @@
/*********************************************************
DllData file -- generated by MIDL compiler
DO NOT ALTER THIS FILE
This file is regenerated by MIDL on every IDL file compile.
To completely reconstruct this file, delete it and rerun MIDL
on all the IDL files in this DLL, specifying this file for the
/dlldata command line option
*********************************************************/
#define PROXY_DELEGATION
#include <rpcproxy.h>
#ifdef __cplusplus
extern "C" {
#endif
EXTERN_PROXY_FILE( ia2_api_all )
PROXYFILE_LIST_START
/* Start of list */
REFERENCE_PROXY_FILE( ia2_api_all ),
/* End of list */
PROXYFILE_LIST_END
DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
#ifdef __cplusplus
} /*extern "C" */
#endif
/* end of generated dlldata file */

File diff suppressed because it is too large Load Diff

View File

@ -10,13 +10,7 @@ MIDL_GENERATED = $$PWD/generated/$${ARCH_SUBDIR}
INCLUDEPATH += $$MIDL_GENERATED
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
SOURCES += $${MIDL_GENERATED}/ia2_api_all_i.c
HEADERS += $${MIDL_GENERATED}/ia2_api_all.h

View File

@ -1,21 +1,17 @@
MIDL = midl
MIDL_OPTS = /out ..\generated
MIDL_OPTS = /dlldata NUL /proxy NUL /notlb /out ..\generated
first: all
all: x86 amd64
MIDL_OPTS = /out ..\generated\x86 /env win32
x86:
-del ..\generated\x86\dlldata.c
-md ..\generated\x86
$(MIDL) $(MIDL_OPTS) ia2_api_all.idl
$(MIDL) $(MIDL_OPTS)\x86 /env win32 ia2_api_all.idl
MIDL_OPTS = /out ..\generated\amd64 /env amd64
amd64:
-del ..\generated\amd64\dlldata.c
-md ..\generated\amd64
$(MIDL) $(MIDL_OPTS) ia2_api_all.idl
$(MIDL) $(MIDL_OPTS)\amd64 /env amd64 ia2_api_all.idl