1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move resource object files to the beginning of linker line in .prl files

Browse Source 
Move collected resource objects to the beginning of the linker line to
prevent order-related issues.

Fixes: QTBUG-92250
Change-Id: Ia046f2820feb693bfadc2b60e07fa001638d4d7b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-06-03 16:10:18 +02:00
parent 5174f979a3
commit 5cc3105807
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtFinishPrlFile.cmake
View File

@ -73,7 +73,7 @@ foreach(line ${lines})
endif() endif()
endforeach() endforeach()
if(rcc_objects) if(rcc_objects)
list(APPEND adjusted_libs ${rcc_objects}) list(PREPEND adjusted_libs ${rcc_objects})
endif() endif()
list(JOIN adjusted_libs " " adjusted_libs_for_qmake) list(JOIN adjusted_libs " " adjusted_libs_for_qmake)
string(APPEND content "QMAKE_PRL_LIBS = ${adjusted_libs_for_qmake}\n") string(APPEND content "QMAKE_PRL_LIBS = ${adjusted_libs_for_qmake}\n")