qt: Fix build for newer versions (#13262)

For some reason, newer versions of qt fail to build because they cannot
find certain system libraries such as libatomic and libdl.

Leaving the qmake compiler set to gcc seems to fix the problem.

Fixes #13221
This commit is contained in:
Michael Kuhn 2019-10-22 01:23:03 +02:00 committed by Adam J. Stewart
parent 26687988eb
commit edf56d8ac4

View File

@ -294,8 +294,6 @@ def patch(self):
@when('@5')
def patch(self):
# Fix qmake compilers in the default mkspec
filter_file('^QMAKE_COMPILER .*', 'QMAKE_COMPILER = cc',
'qtbase/mkspecs/common/g++-base.conf')
filter_file('^QMAKE_CC .*', 'QMAKE_CC = cc',
'qtbase/mkspecs/common/g++-base.conf')
filter_file('^QMAKE_CXX .*', 'QMAKE_CXX = c++',