diff options
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/solutions/terminal/terminalview.cpp | 5 | ||||
| -rw-r--r-- | src/libs/utils/namevaluesdialog.cpp | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/libs/solutions/terminal/terminalview.cpp b/src/libs/solutions/terminal/terminalview.cpp index 0cebe6d9b99..472346b3fcb 100644 --- a/src/libs/solutions/terminal/terminalview.cpp +++ b/src/libs/solutions/terminal/terminalview.cpp @@ -958,11 +958,14 @@ void TerminalView::applySizeChange() }; if (newLiveSize.height() <= 0) - newLiveSize.setHeight(1); + return; if (newLiveSize.width() <= 0) newLiveSize.setWidth(1); + if (d->m_surface->liveSize() == newLiveSize) + return; + resizePty(newLiveSize); d->m_surface->resize(newLiveSize); flushVTerm(true); diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp index 43511fe57f0..35587f87919 100644 --- a/src/libs/utils/namevaluesdialog.cpp +++ b/src/libs/utils/namevaluesdialog.cpp @@ -21,8 +21,7 @@ namespace Internal { static EnvironmentItems cleanUp(const EnvironmentItems &items) { - EnvironmentItems uniqueItems; - QSet<QString> uniqueSet; + EnvironmentItems cleanedItems; for (int i = items.count() - 1; i >= 0; i--) { EnvironmentItem item = items.at(i); if (HostOsInfo::isWindowsHost()) @@ -30,10 +29,10 @@ static EnvironmentItems cleanUp(const EnvironmentItems &items) const QString &itemName = item.name; QString emptyName = itemName; emptyName.remove(QLatin1Char(' ')); - if (!emptyName.isEmpty() && Utils::insert(uniqueSet, itemName)) - uniqueItems.prepend(item); + if (!emptyName.isEmpty()) + cleanedItems.prepend(item); } - return uniqueItems; + return cleanedItems; } class TextEditHelper : public QPlainTextEdit |