From 9b699fa839f560a9ea9da69c8975b9aa4654ab8b Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Tue, 5 Apr 2016 18:39:14 +0300 Subject: Widgets: use QStringRef to optimize memory allocation Replace substring functions that return QString with corresponding functions that return QStringRef where it's possible. Create QString from QStringRef only where necessary. Change-Id: Id1c39093199519f2794b11560c2c0ded2d52b928 Reviewed-by: Marc Mutz --- src/widgets/dialogs/qfiledialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets/dialogs') diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index c4ed72edc3..d9b6dc05bf 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -3823,11 +3823,11 @@ QString QFileDialogPrivate::getEnvironmentVariable(const QString &string) { #ifdef Q_OS_UNIX if (string.size() > 1 && string.startsWith(QLatin1Char('$'))) { - return QString::fromLocal8Bit(qgetenv(string.mid(1).toLatin1().constData())); + return QString::fromLocal8Bit(qgetenv(string.midRef(1).toLatin1().constData())); } #else if (string.size() > 2 && string.startsWith(QLatin1Char('%')) && string.endsWith(QLatin1Char('%'))) { - return QString::fromLocal8Bit(qgetenv(string.mid(1, string.size() - 2).toLatin1().constData())); + return QString::fromLocal8Bit(qgetenv(string.midRef(1, string.size() - 2).toLatin1().constData())); } #endif return string; -- cgit v1.2.3 From 140a273b3c01e8eb3664f14410539339454527d8 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 5 Apr 2016 17:00:44 +0200 Subject: QFontDialog: re-enable X close button in window decoration Change-Id: Id8d9dab7a0e4cf22abefd9bdc7bf2fd4cba1f445 Task-number: QTBUG-32240 Reviewed-by: Friedemann Kleint --- src/widgets/dialogs/qfontdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets/dialogs') diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index d0177941f7..6644f26ad0 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -100,7 +100,7 @@ QFontListView::QFontListView(QWidget *parent) } static const Qt::WindowFlags DefaultWindowFlags = - Qt::Dialog | Qt::WindowSystemMenuHint; + Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint; QFontDialogPrivate::QFontDialogPrivate() : writingSystem(QFontDatabase::Any), -- cgit v1.2.3