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

Don't add qmutex_xxx.cpp to SOURCES, as qmutex.cpp #include's them

Browse Source 
Normally qmake catches the #include and drops the source from SOURCES.
But the parser has bugs, so help it by never adding the files.

The false: SOURCES += is left so that the sources can be found by Qt
Creator.

Task-number: QTBUG-46582
Change-Id: I049a653beeb5454c9539ffff13e667877350346b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
This commit is contained in:
Thiago Macieira 2015-06-10 07:42:42 -07:00 committed by Erik Verbruggen
parent 01f3530650
commit 40cbf1927b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/thread/thread.pri
View File

@ -46,21 +46,21 @@ SOURCES += thread/qatomic.cpp \
unix:SOURCES += thread/qthread_unix.cpp \ unix:SOURCES += thread/qthread_unix.cpp \
thread/qwaitcondition_unix.cpp thread/qwaitcondition_unix.cpp
win32:SOURCES += thread/qmutex_win.cpp \ win32:SOURCES += thread/qthread_win.cpp \
thread/qthread_win.cpp \
thread/qwaitcondition_win.cpp thread/qwaitcondition_win.cpp
integrity:SOURCES += thread/qmutex_unix.cpp \ integrity:SOURCES += thread/qthread_unix.cpp \
thread/qthread_unix.cpp \
thread/qwaitcondition_unix.cpp thread/qwaitcondition_unix.cpp
unix: { false {
mac { # files #included by others, but listed here so IDEs parsing this file know
SOURCES += thread/qmutex_mac.cpp # they are part of QtCore. Usually, qmake can find out that certain files
} else:linux-*:!linux-lsb-* { # are #included by others and thus remove from SOURCES, but it gets lost
SOURCES += thread/qmutex_linux.cpp # with qmutex.cpp.
} else { SOURCES += \
SOURCES += thread/qmutex_unix.cpp thread/qmutex_linux.cpp \
} thread/qmutex_mac.cpp \
thread/qmutex_unix.cpp \
thread/qmutex_win.cpp
} }