AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not build dlldata.c in static builds

Browse Source 
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>
This commit is contained in:
Miikka Heikkinen 2012-12-17 11:51:59 +02:00 committed by The Qt Project
parent 797f3c0a01
commit daef188711
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/3rdparty/iaccessible2/iaccessible2.pri vendored
View File

@ -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 \