From e7fe8de4dd8c3ce9a5e296001754d6ee3f28236b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 15 May 2012 15:24:49 +0200
Subject: [PATCH] Qt versions/qmake dialog: Join filter list correctly.
Do not add a trailing blank.
Change-Id: I0b187345415d96508be495860c530bd2f0c292c6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
src/plugins/qtsupport/qtoptionspage.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 4d493b0ea87..a33b8ae3ffe 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -642,12 +642,15 @@ QtOptionsPageWidget::~QtOptionsPageWidget()
static QString filterForQmakeFileDialog()
{
QString filter = QLatin1String("qmake (");
- foreach (const QString &s, Utils::BuildableHelperLibrary::possibleQMakeCommands()) {
+ const QStringList commands = Utils::BuildableHelperLibrary::possibleQMakeCommands();
+ for (int i = 0; i < commands.size(); ++i) {
+ if (i)
+ filter += QLatin1Char(' ');
#ifdef Q_OS_MAC
// work around QTBUG-7739 that prohibits filters that don't start with *
filter += QLatin1Char('*');
#endif
- filter += s + QLatin1Char(' ');
+ filter += commands.at(i);
}
filter += QLatin1Char(')');
return filter;
--
GitLab