Skip to content

Commit

Permalink
Move resource object files to the beginning of linker line in .prl files
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
semlanik committed Jun 3, 2021
1 parent 5174f97 commit 5cc3105
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmake/QtFinishPrlFile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ foreach(line ${lines})
endif()
endforeach()
if(rcc_objects)
list(APPEND adjusted_libs ${rcc_objects})
list(PREPEND adjusted_libs ${rcc_objects})
endif()
list(JOIN adjusted_libs " " adjusted_libs_for_qmake)
string(APPEND content "QMAKE_PRL_LIBS = ${adjusted_libs_for_qmake}\n")
Expand Down

0 comments on commit 5cc3105

Please sign in to comment.