diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-11-24 12:36:22 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-11-26 08:15:19 +0100 |
commit | 6df7be247688215d7565461c32078a4df997b52c (patch) | |
tree | 523ff35a9578d360298ecb7e42bd6f0a6c54f6af /src/gui/kernel/qplatformwindow.cpp | |
parent | ae9ee18cad4e9485ad53ac41916d7e2e77c3cbd1 (diff) |
Prevent duplication of display name in window titles.
Do not append QGuiApplicationPrivate::displayName() to window title
if the title already contains it.
Fixes Qt Designer showing up with window title
Qt Designer - Qt Designer
after qttools:9a58492ce6b62c0fdab373337f39103f4072ad9d
Change-Id: I5ac07a7f4be70372342324a175faf8c825867f50
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/gui/kernel/qplatformwindow.cpp')
-rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 976d89b30a..c6e5cfb9d6 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -453,7 +453,7 @@ bool QPlatformWindow::frameStrutEventsEnabled() const QString QPlatformWindow::formatWindowTitle(const QString &title, const QString &separator) { QString fullTitle = title; - if (QGuiApplicationPrivate::displayName) { + if (QGuiApplicationPrivate::displayName && !title.endsWith(*QGuiApplicationPrivate::displayName)) { // Append display name, if set. if (!fullTitle.isEmpty()) fullTitle += separator; |