Skip to content

Commit ea8fb52

Browse files
committed
Fixed a bug with a >5.6 QMap API usage.
1 parent dc95f71 commit ea8fb52

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/diskbrowser/dbsettings.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ void DbSettings::clone(DbSettings& other)
3232

3333
void DbSettings::merge(DbSettings& other)
3434
{
35-
_dirMap.insert(other.getDirMap());
35+
for(auto i = other.getDirMap().constBegin();
36+
i != other.getDirMap().constEnd();
37+
i++
38+
) {
39+
_dirMap.insert(i.key(), i.value());
40+
}
3641
_dirty = true;
3742
}

0 commit comments

Comments
 (0)