diff options
author | Iikka Eklund <iikka.eklund@digia.com> | 2012-09-06 13:42:29 +0300 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-09-28 14:48:05 +0200 |
commit | e806630f4b715e91541391710f8489188c0a0655 (patch) | |
tree | d4b6f8fc1e994c60c58975e0c1e03331784c58e3 /src | |
parent | 33d649f07a32a8d1b165b322ebbf8b28bed20d41 (diff) |
Fix filter list handling in qtpatchoperation.cpp
Fix a bug in filter handling. If no filters were given it caused all
files to be included which was not the original intention.
Added a check if no filters given then do not even try to search files
by type.
Change-Id: I2ceb83611c1c9a4a9f8bf58da0673c963dd4ae0c
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index cec0b84ed..4941a00c3 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -315,10 +315,12 @@ bool QtPatchOperation::performOperation() #endif // get file list defined by filters and patch them - QStringList filteredContent = getDirContent(prefix, filters); - foreach (QString fileName, filteredContent) { - if (QFile::exists(fileName)) { - QtPatch::patchTextFile(fileName, searchReplacePairs); + if (filters.count() > 0) { + const QStringList filteredContent = getDirContent(prefix, filters); + foreach (const QString &fileName, filteredContent) { + if (QFile::exists(fileName)) { + QtPatch::patchTextFile(fileName, searchReplacePairs); + } } } |