diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-05-02 18:51:57 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-05-13 19:18:59 +0000 |
| commit | 7cba2acd2cc4b68b5a4de2251ab555adb09bf7e8 (patch) | |
| tree | e4f6453417becfd6df89f6c21bfae549db850cde /qmake/qmake.pro | |
| parent | ac4cf6e2b2dfc6ee37b0c64e1dd201e2b2452c31 (diff) | |
qmake: replace QLinkedList with std::list
This is in preparation of deprecating QLinkedList.
There is but one substantial change: Instead of copying the linked list,
we move it now, and instead of copying items between these two lists, we
use std::list::splice(), which just relinks nodes. It is a bit surprising
that the comment on the ProValueMapStack suggests references into the
container must remain stable, and then some code changes addresses by
making copies of the elements.
This was probably a bug waiting to manifest itself.
Since nothing else in qmake is using QLinkedList now, remove qlinkedlist.o
from the qmake build.
Change-Id: I08a5b0661466bf50ad8f9f8abf58bc801aef4ddc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/qmake.pro')
| -rw-r--r-- | qmake/qmake.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 6a6116c8db..276c1237a9 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -136,7 +136,6 @@ SOURCES += \ qjsonparser.cpp \ qjsonvalue.cpp \ qlibraryinfo.cpp \ - qlinkedlist.cpp \ qlist.cpp \ qlocale.cpp \ qlocale_tools.cpp \ @@ -189,7 +188,6 @@ HEADERS += \ qjsonparser_p.h \ qjsonvalue.h \ qjsonwriter_p.h \ - qlinkedlist.h \ qlist.h \ qlocale.h \ qlocale_tools_p.h \ |