summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-06-03 16:10:18 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2021-06-03 19:37:46 +0200
commit5cc3105807a7f1868b067e5d9757acab0a2bb8e8 (patch)
tree30ab37030e4a735b0c14d2572945e93a3861b21a
parent5174f979a3df1e24762f1b9829bb983ed4d7402a (diff)
Move resource object files to the beginning of linker line in .prl files
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>
-rw-r--r--cmake/QtFinishPrlFile.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake
index 31936dd74e..a932f2f988 100644
--- a/cmake/QtFinishPrlFile.cmake
+++ b/cmake/QtFinishPrlFile.cmake
@@ -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")