From 96baec6386db90cca59f2aea931ceb439d3eff5b Mon Sep 17 00:00:00 2001 From: Vadim Peretokin Date: Wed, 5 Jan 2022 08:46:13 +0100 Subject: [PATCH] Infrastructure: switch to our qt-orderedmap fork (#5812) #### Brief overview of PR changes/additions Until https://github.com/mandeepsandhu/qt-ordered-map/pull/29 is accepted, lets switch to our fork which has the fix. #### Motivation for adding to Mudlet Remove the tens of messages like this we get while compiling: ``` [39/74] Building CXX object src/CMakeFiles/mudlet.dir/TDockWidget.cpp.o In file included from /media/vadi/SSDer/Programs/Mudlet/src/TDockWidget.cpp:21: In file included from /media/vadi/SSDer/Programs/Mudlet/src/TDockWidget.h:23: In file included from /media/vadi/SSDer/Programs/Mudlet/src/mudlet.h:70: /media/vadi/SSDer/Programs/Mudlet/src/../3rdparty/qt-ordered-map/src/orderedmap.h:118:11: warning: class member cannot be redeclared [-Wredeclared-class-member] class const_iterator; ^ /media/vadi/SSDer/Programs/Mudlet/src/../3rdparty/qt-ordered-map/src/orderedmap.h:47:11: note: previous declaration is here class const_iterator; ^ 1 warning generated. ``` --- 3rdparty/qt-ordered-map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/qt-ordered-map b/3rdparty/qt-ordered-map index e1a26e336a3..234e6b601e6 160000 --- a/3rdparty/qt-ordered-map +++ b/3rdparty/qt-ordered-map @@ -1 +1 @@ -Subproject commit e1a26e336a3afe17f160f17520259bded9ddffeb +Subproject commit 234e6b601e62ed172101c3afaef77a6faec982e0