diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-28 13:44:30 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-07 11:18:19 +0100 |
| commit | 46bb348b8e7b8dd2e5d67f73948a0f2aa1801ac3 (patch) | |
| tree | f0575bc916af7aa8a2935faacf0d7df6514b7db9 | |
| parent | 0ea6dae91934b0dcd00d5d0d5f4c9fb7dd2dfde6 (diff) | |
Qt Designer: Fix deprecation warning about QMap::unite()
Replace by QMap::insert(), fixing:
shared\qlayout_widget.cpp:1918:79: warning: 'QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = int; T = bool]' is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
shared\qlayout_widget.cpp:1922:82: warning: 'QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = int; T = bool]' is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
Change-Id: I57c48aa52399b2a372c683aab8117bb8031002af
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| -rw-r--r-- | src/designer/src/lib/shared/qlayout_widget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index d87874105..5090aae17 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -1915,11 +1915,11 @@ void QLayoutWidget::paintEvent(QPaintEvent*) columns[column + i - 2] = true; while (rowSpan > 0) { - excludedColumnsForRow[row + rowSpan - 1].unite(columns); + excludedColumnsForRow[row + rowSpan - 1].insert(columns); rowSpan--; } while (columnSpan > 0) { - excludedRowsForColumn[column + columnSpan - 1].unite(rows); + excludedRowsForColumn[column + columnSpan - 1].insert(rows); columnSpan--; } } |