diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-12-17 11:51:59 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-18 10:06:59 +0100 |
commit | daef188711e4c7459eb8d399778d1766979e80e0 (patch) | |
tree | e3dd372e32a5796471c97bb1bd67d84140142982 /src/3rdparty | |
parent | 797f3c0a01e9adf0af3bc7c0bd3f7f63849d99b9 (diff) |
Do not build dlldata.c in static builds
Symbols in dlldata.c conflict with symbols defined in ActiveQt
when linking Windows platform plugin statically into same binary.
Fixed by not building dlldata.c when building static library.
Task-number: QTBUG-28645
Change-Id: Ibc5928124ad6e1fde2a1fa761ada4f345eb65a20
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/iaccessible2/iaccessible2.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/iaccessible2/iaccessible2.pri b/src/3rdparty/iaccessible2/iaccessible2.pri index 954f4c9e7c..b3cdfa9356 100644 --- a/src/3rdparty/iaccessible2/iaccessible2.pri +++ b/src/3rdparty/iaccessible2/iaccessible2.pri @@ -40,8 +40,12 @@ SOURCES += $${MIDL_GENERATED}/Accessible2_i.c \ $${MIDL_GENERATED}/AccessibleText_i.c \ $${MIDL_GENERATED}/AccessibleValue_i.c -SOURCES += $${MIDL_GENERATED}/IA2TypeLibrary_i.c \ - $${MIDL_GENERATED}/dlldata.c +SOURCES += $${MIDL_GENERATED}/IA2TypeLibrary_i.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 \ |