diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-09-03 09:08:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-09-03 09:08:49 +0200 |
| commit | a225e5b867db4202c87ca8dcebb8c0a1b1d68e21 (patch) | |
| tree | 224c85c92ef9b6c371a2315d68d0c3f3e66279e3 /src/plugins/qtsupport/qtoptionspage.cpp | |
| parent | b7a1e87cf4377590c4e20d3dfb11f9bfa9ebf19b (diff) | |
| parent | 67e9bdbd44eceb670e61161df96150f590d66873 (diff) | |
| download | qt-creator-a225e5b867db4202c87ca8dcebb8c0a1b1d68e21.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Diffstat (limited to 'src/plugins/qtsupport/qtoptionspage.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 08c773ff76..e8d8d1a46f 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -622,6 +622,11 @@ static QString filterForQmakeFileDialog() // work around QTBUG-7739 that prohibits filters that don't start with * filter += QLatin1Char('*'); filter += commands.at(i); +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + // kde bug, we need at least one wildcard character + // see QTCREATORBUG-7771 + filter += QLatin1Char('*'); +#endif } filter += QLatin1Char(')'); return filter; |