Details
-
Bug
-
Resolution: Cannot Reproduce
-
Not Evaluated
-
None
-
5.6.1, 5.6.2, 5.7.0
-
None
-
OSX - but assume same issue would be present on others
Description
Was testing make of multiple versions of qt on OSX and discovered the QTBUG-46582 error of duplicate symbols.
It is fixed in 5.6.0, but the qtbase/src/corelib/thread/thread.pri
in 5.6.1+ has it back.
(i.e. SOURCES += qmutex_mac.cpp whereas qmutex.cpp includes this - see Gerrit comment in original bug)
e.g.:
$ diff qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/thread/thread.pri qt-everywhere-opensource-src-5.6.1/qtbase/src/corelib/thread/thread.pri
46,59c46
< unix:SOURCES += thread/qthread_unix.cpp \
< thread/qwaitcondition_unix.cpp
<
< win32:SOURCES += thread/qthread_win.cpp \
< thread/qwaitcondition_win.cpp
<
< integrity:SOURCES += thread/qthread_unix.cpp \
< thread/qwaitcondition_unix.cpp
<
< false {
< # files #included by others, but listed here so IDEs parsing this file know
< # they are part of QtCore. Usually, qmake can find out that certain files
< # are #included by others and thus remove from SOURCES, but it gets lost
< # with qmutex.cpp.
---
> win32 {
61,64c48,61
< thread/qmutex_linux.cpp \
< thread/qmutex_mac.cpp \
< thread/qmutex_unix.cpp \
< thread/qmutex_win.cpp
---
> thread/qmutex_win.cpp \
> thread/qthread_win.cpp \
> thread/qwaitcondition_win.cpp
> } else {
> darwin {
> SOURCES += thread/qmutex_mac.cpp
> } else: linux {
> SOURCES += thread/qmutex_linux.cpp
> } else {
> SOURCES += thread/qmutex_unix.cpp
> }
> SOURCES += \
> thread/qthread_unix.cpp \
> thread/qwaitcondition_unix.cpp
66d62
<
Same is true for 5.6.1-1, 5.6.2, 5.7.0
Attachments
Issue Links
- resulted from
-
-
- Closed
-