diff options
author | Jan Arve Saether <jan-arve.saether@theqtcompany.com> | 2015-01-26 16:56:34 +0100 |
---|---|---|
committer | Jan Arve Sæther <jan-arve.saether@theqtcompany.com> | 2015-02-04 14:59:03 +0000 |
commit | 3f431e279aab16465496cc0de03a1af874c1ce65 (patch) | |
tree | 90e5bf97ae926f7ffad7a05609783d885929d537 /src/3rdparty/iaccessible2/iaccessible2.pri | |
parent | 37e7c3afbc26d547daf94655a4dff1dfb59e5545 (diff) |
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>
Diffstat (limited to 'src/3rdparty/iaccessible2/iaccessible2.pri')
-rw-r--r-- | src/3rdparty/iaccessible2/iaccessible2.pri | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/3rdparty/iaccessible2/iaccessible2.pri b/src/3rdparty/iaccessible2/iaccessible2.pri index c7daa760c6..367980a0d2 100644 --- a/src/3rdparty/iaccessible2/iaccessible2.pri +++ b/src/3rdparty/iaccessible2/iaccessible2.pri @@ -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 |